From a4cb11a26830fde8b77b4ee558c9fffc341e8e81 Mon Sep 17 00:00:00 2001 From: Eric Lay Date: Sun, 28 Jun 2020 09:19:54 -0500 Subject: [PATCH] fixed installed annotation issue --- fpf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fpf b/fpf index 9bbbf3c..ea64500 100644 --- a/fpf +++ b/fpf @@ -14,7 +14,7 @@ Help() { echo echo "l Search/List installed packages from official repo" echo - echo "la Search/List installed packages from AUR repo" + echo "la Search/List installed packages only from AUR repo" echo echo "R Search/List installed packages for removal" echo @@ -22,7 +22,7 @@ Help() { echo } -### Manjaro Repo +### Official Repo # Check things are up to date UpdateInfos() { [ -f /var/lib/pacman/sync/core.files ] || { echo -e "Syncing files database"; sudo pacman -Fy; } @@ -38,7 +38,7 @@ Orepo() { echo "Setting things up..." sort <(comm -23 <(pacman -Slq | sort) <(pacman -Qq | sort)) <(comm -12 <(pacman -Slq | sort) <(pacman -Qq | sort) | awk '{print $0" \033[32m*\033[0m"}') > /tmp/packages echo "$(echo -e ' Select packages to install\n (use TAB to toggle selection)'; cat /tmp/packages)" > /tmp/packages - cat /tmp/packages |fzf -q "$1" -e -m --preview 'cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' --preview-window=65%:wrap --layout=reverse --marker='>>' --header-lines=2 --info=hidden --ansi --margin="2%,1%,2%,1%" --cycle | xargs -ro sudo pacman -S + cat /tmp/packages |fzf -q "$1" -e -m --preview 'cat <(pacman -Si {1}) <(pacman -Fl {1} | 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 sudo pacman -S } # List installed pkgs @@ -61,10 +61,10 @@ Arepo() { [ -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 + 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 } -# List installed pkgs from AUR +# List installed pkgs only from AUR AurInstalled() { sort <(pacman -Qqm) > /tmp/aur_installed_packages echo "$(echo -e ' Select packages to print info\n (use TAB to toggle selection)'; cat /tmp/aur_installed_packages)" > /tmp/aur_installed_packages