From 3050f4ed972df8c3dfd18a1d9b277c0c8d3984b0 Mon Sep 17 00:00:00 2001 From: Eric Lay Date: Sun, 28 Jun 2020 22:36:01 -0500 Subject: [PATCH] date check for aur pkg list --- fpf | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fpf b/fpf index 43ba794..9219395 100644 --- a/fpf +++ b/fpf @@ -28,8 +28,10 @@ Help() { # Check things are up to date UpdateInfos() { [ -f /var/lib/pacman/sync/core.files ] || { echo -e "Syncing files database"; sudo pacman -Fy; } - d1="${$(stat -c %y /var/lib/pacman/sync/core.files):0:10}" - d2="${$(stat -c %y /var/lib/pacman/sync/core.db):0:10}" + d1=$(stat -c %y /var/lib/pacman/sync/core.files) + d2=$(stat -c %y /var/lib/pacman/sync/core.db) + d1="${d1:0:10}" + d2="${d2:0:10}" [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Files database is out of date\nSyncing now..."; sudo pacman -Fy; } } @@ -58,10 +60,12 @@ Remove() { ### AUR # Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install Aur() { - [ -f /tmp/aur/packages ] || { wget -P /tmp/aur/ https://aur.archlinux.org/packages.gz >/dev/null 2>&1 && gunzip -f /tmp/aur/packages.gz; echo "$(tail -n +2 /tmp/aur/packages)" > /tmp/aur/packages; } - d1="${$(stat -c %y /tmp/aur/packages):0:10}" - d2="$(date -I'date')" - [[ "${d2///-/}" > "${d1//-/}" ]] && { wget -P /tmp/aur/ https://aur.archlinux.org/packages.gz >/dev/null 2>&1 && gunzip -f /tmp/aur/packages.gz; echo "$(tail -n +2 /tmp/aur/packages)" > /tmp/aur/packages; } + echo "Setting things up..." + [ -f /tmp/aur/packages ] || { echo -e "Syncing AUR package database..."; wget -P /tmp/aur/ https://aur.archlinux.org/packages.gz >/dev/null 2>&1 && gunzip -f /tmp/aur/packages.gz; echo "$(tail -n +2 /tmp/aur/packages)" > /tmp/aur/packages; } + d1=$(stat -c %y /tmp/aur/packages) + d1="${d1:0:10}" + d2=$(date -I'date') + [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Syncing AUR package database..."; wget -P /tmp/aur/ https://aur.archlinux.org/packages.gz >/dev/null 2>&1 && gunzip -f /tmp/aur/packages.gz; echo "$(tail -n +2 /tmp/aur/packages)" > /tmp/aur/packages; } sort <(comm -23 <(sort /tmp/aur/packages) <(pacman -Qq | sort)) <(comm -12 <(sort /tmp/aur/packages) <(pacman -Qq | sort) | awk '{print $0" \033[32m*\033[0m"}') > /tmp/aur_packages echo "$(echo -e ' Select packages to install\n (use TAB to toggle selection)'; cat /tmp/aur_packages)" > /tmp/aur_packages cat /tmp/aur_packages | fzf -q "$1" -e -m --preview 'cat <(yay -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' --preview-window=65%:wrap --layout=reverse --marker='>>' --header-lines=2 --info=hidden --ansi --margin="2%,1%,2%,1%" --cycle | sed -e 's/\*$//' | xargs -ro yay -S @@ -92,7 +96,6 @@ else for opt in "$@"; do case $opt in -a|--aur) - echo -e "Syncing AUR package database..." Aur "$2" ;; -l|--list-installed)