work in progress

This commit is contained in:
Eric Lay 2020-06-27 17:16:04 -05:00
parent e7c65c4366
commit cfc557bed3
1 changed files with 6 additions and 7 deletions

13
fpf
View File

@ -27,12 +27,12 @@ Help() {
### Manjaro Repo ### Manjaro Repo
#Double check things are up to date #Double check things are up to date
UpdateInfos() { 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) d1=$(stat -c %y /var/lib/pacman/sync/core.files)
d2=$(stat -c %y /var/lib/pacman/sync/core.db) d2=$(stat -c %y /var/lib/pacman/sync/core.db)
d1="${d1:0:10}" d1="${d1:0:10}"
d2="${d2: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 #Get Manjaro package list, sort, mark installed, preview infos and finally hand off to pacman for install
@ -60,8 +60,7 @@ Remove() {
### AUR Repo ### AUR Repo
#Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install #Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install
Arepo() { Arepo() {
wget -P /tmp/aur/ https://aur.archlinux.org/packages.gz >/dev/null 2>&1 && gunzip -f /tmp/aur/packages.gz [ -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; }
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 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 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 | xargs -ro yay -S
@ -106,9 +105,9 @@ else
-la|--list-aur-installed) -la|--list-aur-installed)
AurInstalled "$2" AurInstalled "$2"
;; ;;
# -o|--orphans) -o|--orphans)
# Orphans "$2" Orphans "$2"
# ;; ;;
-R|--remove) -R|--remove)
Remove "$2" Remove "$2"
;; ;;