From cfc557bed3eccd2e94418aa1f66524402b2177ab Mon Sep 17 00:00:00 2001 From: Eric Lay Date: Sat, 27 Jun 2020 17:16:04 -0500 Subject: [PATCH] work in progress --- fpf | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fpf b/fpf index 09b2f48..3c84285 100644 --- a/fpf +++ b/fpf @@ -27,12 +27,12 @@ Help() { ### Manjaro Repo #Double check things are up to date UpdateInfos() { - [ -f /var/lib/pacman/sync/core.files ] || { echo -e "Syncing files database"; sudo pacman -Fy } + [ -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) 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 } + [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Files database is out of date\nSyncing now..."; sudo pacman -Fy; } } #Get Manjaro package list, sort, mark installed, preview infos and finally hand off to pacman for install @@ -60,8 +60,7 @@ Remove() { ### AUR Repo #Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install Arepo() { - 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 + [ -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; } 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 | xargs -ro yay -S @@ -106,9 +105,9 @@ else -la|--list-aur-installed) AurInstalled "$2" ;; -# -o|--orphans) -# Orphans "$2" -# ;; + -o|--orphans) + Orphans "$2" + ;; -R|--remove) Remove "$2" ;;