aur updater updated

updating updater
updated updater
2023-11-21 18:15:30 -06:00 · 2023-11-21 06:45:36 -06:00 · 2023-11-20 21:50:24 -06:00 · 2023-11-20 21:06:47 -06:00 · 2023-11-20 18:19:27 -06:00 · 2023-11-20 18:15:59 -06:00
5 changed files with 268 additions and 317 deletions
--- a/11
+++ b/11
@ -1,6 +1,7 @@
 # Maintainer: Eric Lay <ericlaytm@gmail.com>
+# Contributor: Yochananmarqos
 pkgname=fuzzy-pkg-finder
-pkgver=0.9.6
+pkgver=1.2
 pkgrel=1
 pkgdesc="Simple cli command for using fzf to search and install packages"
 arch=('x86_64' 'aarch64' 'armv7h')
@ -8,15 +9,17 @@ url="https://github.com/ericlay/$pkgname"
 license=('GPL3')
 depends=('pacman'
    'fzf'
-    'wget')
+    'expac'
+    'curl'
+    'gzip'
+    'jq')
 makedepends=('git')
 optdepends=('yay: AUR helper'
 			'paru: AUR helper')
-source=("git+https://gitlab.com/airclay/fuzzy-pkg-finder.git#tag=v$pkgver")
+source=("git+https://github.com/ericlay/fuzzy-pkg-finder.git#tag=v$pkgver")
 md5sums=('SKIP')

 package() {
 	cd "$srcdir/$pkgname"
 	install -Dm755 fpf -t "$pkgdir/usr/bin"
-    install -Dm755 fpff -t "$pkgdir/usr/bin"
 }
--- a/README.md
+++ b/README.md
@ -6,18 +6,29 @@

 **Simple cli utility using fzf to search and install/list/remove packages.**\
 \
-![Screenshot](https://gitlab.com/airclay/fuzzy-pkg-finder/-/raw/master/fpf.png) \
+![Screenshot](https://raw.githubusercontent.com/ericlay/fuzzy-pkg-finder/master/fpf.png) \
 \
-Leverages the power of fzf to search package names and presents complete package information in preview pane. \
-On selection will hand off to Pacman or Yay to complete transaction. \
+Leverages the power of fzf to search package names and descriptions then presents complete package information in preview pane. \
+On selection will hand off to Pacman or Paru/Yay to complete transaction. \
  \
 *For use with Pacman/Yay/Paru package managers only.*\
 \
-Installation: \
-Arch and arch-based distros, it is available in the AUR. \
-`paru -S fuzzy-pkg-finder` or `yay -S fuzzy-pkg-finder` \
+There are countless fzf package manager wrappers out there, some much more built out that this. \
+What separates Fuzzy-pkg-finder?
+- It's mine and it works the way I like it to
+- It works as a simple script to wrap pacman/yay/paru, no need to rebuild the wheel
+- Searches both package names and descriptions for keyword
+- Hide preview window to see only packages and descriptions
+- Shows files list and/or missing files for official repo or installed AUR packages
+- Toggle between package info view and PKGBUILD view on AUR package preview
+- Update feature shows package information and link to recent commits \
 \
-Manual build and install: \
+ \
+Installation: \
+For Arch and arch-based distros, it is available in the AUR. \
+Use: `paru -S fuzzy-pkg-finder` or `yay -S fuzzy-pkg-finder` \
+ \
+Manual build and install:
 ```
 git clone https://github.com/ericlay/fuzzy-pkg-finder
 cd fuzzy-pkg-finder
@ -26,29 +37,46 @@ makepkg -sric
 \
 Usage: 
 ```
-Syntax: fpf -[a|l|la|R|o|h]
+Syntax: fpf [-a| --aur] [-l| --list-installed] [-la| --list-aur-installed]
+              [R| --remove] [-o| --orphans] [-U | --update] [-h | --help]
 Defaults to Pacman if no options passed

 Searching for a package:
 ex: fpf [pkg name] for official repo search
 ex: fpf -a [pkg name] for aur search

-options:
-a     Search/List and install from AUR with Yay
-l     Search/List installed packages from official repo
-la    Search/List installed packages from AUR 
-R     Search/List installed packages for removal
-o     Search/List orphaned packages for removal
-h     Print this help screen.
+Options:
+-a, --aur
+    Search/List and install from AUR with Yay
+
+-l, --list-installed
+    Search/List installed packages from official repo
+
+-la, --list-aur-installed
+    Search/List installed packages from AUR 
+
+-R, -remove
+     Search/List installed packages for removal
+
+-o, --orphans
+     Search/List orphaned packages for removal
+
+-U, --update
+     Shows packages with updates available
+
+-h, --help
+     Print this help screen
 ```
 \
 Keybinds:
 ```
+'ctrl + /' Toggle the preview window
+'ctrl + h' Show help in the preview window
+'ctrl + k' Show the keybinds in the preview window
+'ctrl + n' Move to the next selected item
+'ctrl + b' Back to previoius selected item
+
 When browsing AUR or installed Aur pkgs:
-'ctrl + p' Will preview the highlighted pkgbuild file
-'ctrl + x' Will return to the highlighted pkg info
+'ctrl + p' Preview the highlighted pkgbuild file
+'ctrl + x' Return to the highlighted pkg info
 ```
- \
-*Fish shell users:* \
-Use alternate `fpff` command instead. (fuzzy-pkg-finder-fish)\
-Same script just adapted the bash-isms so the preview window will work.
--- a/290
+++ b/290
@ -2,176 +2,300 @@

 ### Help 
 Help() {
-    echo
-    echo "Use fzf to search and install with Pacman and Yay"
-    echo "Defaults to Pacman if no options passed"
-    echo
-    echo "Syntax: fpf -[a|l|la|R|o|h]"
-    echo
-    echo "options:"
-    echo
-    echo "a     Search/List and install from AUR with Yay"
-    echo
-    echo "l     Search/List installed packages from official repo"
-    echo
-    echo "la    Search/List installed packages only from AUR repo"
-    echo
-    echo "R     Search/List installed packages for removal"
-    echo
-    echo "o     Search/List orphaned packages for removal"
-    echo
-    echo "h     Print this help screen."
-    echo
-    echo " Fish shell users should use \"fpff\" command instead"
+	helpF="/tmp/fpf-help"
+    { printf "\n%s\n" "Use fzf to search and install with Pacman or Yay/Paru"
+    printf "\n%s\n\t%s\n\t\t%s\n" "SYNTAX" \
+	"fpf [-a| --aur] [-l| --list-installed] [-la| --list-aur-installed]" "[R| --remove] [-o| --orphans] [-h | --help]" 
+	printf "\n%s\n\t%s\n\t\t%s\n\n\t%s\n\t\t%s\n" "EXAMPLE" "For official repo search:" \
+	"fpf [pkg name]" "For AUR search:" "fpf -a [pkg name]"
+	printf "\n%s\n" "OPTIONS"
+	printf "\t%s\n\\t\t%s\n\n" "-l, --list-installed" "Search/List installed packages from official repo"
+	printf "\t%s\n\\t\t%s\n\n" "-la, --list-aur-installed" "Search/List installed packages from AUR"
+	printf "\t%s\n\\t\t%s\n\n" "-a, --aur" "Search/List and install from AUR with Yay"
+	printf "\t%s\n\\t\t%s\n\n" "-R, -remove" "Search/List installed packages for removal"
+	printf "\t%s\n\\t\t%s\n\n" "-o, --orphans" "Search/List orphaned packages for removal"
+	printf "\t%s\n\\t\t%s\n\n" "-U, --update" "Show packages with updates available"
+	printf "\t%s\n\\t\t%s\n\n" "-h, --help" "Print this help screen"; } > "$helpF"
+}
+
+KBINDS() {
+	kbindF="/tmp/fpf-kbinds"
+	{ printf "\n%s\n\n  %s\n" "Keybinds:" "GLOBAL"
+	printf "\t%s\t%s\n" "'ctrl + h'" "Show help in the preview window"
+	printf "\t%s\t%s\n" "'ctrl + k'" "Show the keybinds in the preview window" 
+	printf "\t%s\t%s\n" "'ctrl + /'" "Toggle the preview window" 
+	printf "\t%s\t%s\n" "'ctrl + n'" "Move to the next selected item"
+	printf "\t%s\t%s\n" "'ctrl + b'" "Back to previoius selected item"
+	printf "\n  %s\n" "AUR"
+	printf "\t%s\t%s\n" "'ctrl + p'" "Preview the highlighted pkgbuild file"
+	printf "\t%s\t%s\n" "'ctrl + x'" "Return to the highlighted pkg info"; } > "$kbindF"
 }

 #	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 ] || { printf "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//-/}" ]] && { printf "Files database is out of date\nSyncing now..."; sudo pacman -Fy; }
+}
+
+UpdateAurInfos() {
+	[[ ! -d /tmp/aur ]] && mkdir -p /tmp/aur
+	zcat <(curl  https://aur.archlinux.org/packages-meta-ext-v1.json.gz) |
+	jq --compact-output '.[] |
+	{ Name, Description } ' |
+	awk -F'"' '{ printf "%-20s\t%s\n", $4, $8}' > /tmp/aur/fpf-packages-meta
+	while IFS= read -r pkgName; do
+		grep -w "^$pkgName " /tmp/aur/fpf-packages-meta >> /tmp/aur/fpf-installed
+	done < <(pacman -Qqm)
+	sort <(comm -23 <(cat /tmp/aur/fpf-packages-meta | sort) <( cat /tmp/aur/fpf-installed | sort)) \
+	<(comm -12 <( cat /tmp/aur/fpf-packages-meta | sort) <(cat /tmp/aur/fpf-installed | sort) |
+	awk -F"\t" '{print $1" \033[32m*\033[0m  ", $2}') -o /tmp/aur/fpf-packages-meta
+}
+
+AurFD() {
+	[ -f /tmp/aur/packages-meta ] || 
+	printf "Syncing AUR package information..." && UpdateAurInfos
+	d1=$(stat -c %y /tmp/aur/fpf-packages-meta)
+	d1="${d1:0:10}"
+	d2=$(date -I'date')
+	[[ "${d2///-/}" > "${d1//-/}" ]] && { 
+	printf "Syncing AUR package information..."; UpdateAurInfos; }
 }

 #	Check AUR helper
 AHELPR=""
+AHELPRUPDATE=""
 if [[ -z "$AHELPR" ]]
 then
    if [[ -f /usr/bin/paru ]]
    then 
    	AHELPR="paru"
+		AHELPRUPDATE="paru -Sua"
    elif [[ -f /usr/bin/yay ]]
    then
    	AHELPR="yay"
+		AHELPRUPDATE="yay -a"
    else
-    	echo -e "Suitable AUR Helper not found.\nPlease install \"paru\" or \"yay\" to continue."
+    	printf "Suitable AUR Helper not found.\nPlease install \"paru\" or \"yay\" to continue."
 		exit 1
 	fi
 fi

+#	Create the helper files
+Help
+KBINDS
+
 ### Official Repo
 #	Get Official package list, sort, mark installed, preview infos and finally hand off to pacman for install
 Official() {
-	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 |
+	printf "Setting things up..."
+	sort <(comm -23 <(expac -S '%-20n\t%d' | sort) <(expac '%-20n\t%d' | sort)) <(comm -12 <(expac -S '%-20n\t%d' | sort) \
+	<(expac '%-20n\t%d' | sort) | awk -F"\t" '{print $1"\033[32m*\033[0m  ", $2}') &>/dev/null  >  /tmp/fpf-packages
  	fzf -q "$1" -e -m \
  	--preview='cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' \
-  	--preview-window=65%:wrap \
+  	--preview-window=55%:wrap:border-sharp \
  	--layout=reverse \
  	--marker='>>' \
-  	--header-lines=2 \
+  	--header="$(echo -e '\n Select packages to install\n (use TAB to toggle selection)\n\n')" \
  	--info=hidden \
  	--ansi \
  	--margin="2%,1%,2%,1%" \
-  	--cycle |
+  	--cycle \
+	--tiebreak=begin,chunk,length \
+	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
+	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+	--bind 'ctrl-/:change-preview-window(hidden|)' \
+	--bind ctrl-n:next-selected,ctrl-b:prev-selected < /tmp/fpf-packages |
+  	awk '{print $1}' |
  	sed -e 's/\*$//' |
  	xargs -ro sudo pacman -S
 }

 #	List installed pkgs
 Installed() {
-	sort <(pacman -Qqs) > /tmp/installed_packages
-	echo "$(echo -e ' Select packages to print info\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /tmp/installed_packages
-	cat /tmp/installed_packages |
+	expac '%-20n\t%d' |
 	fzf -q "$1" -e -m \
 	--preview='cat <(pacman -Qik {1}) <(echo "") <(pacman -Fl {1} | awk "{print \$2}")' \
 	--preview-window=65%:wrap \
 	--layout=reverse \
 	--marker='>>' \
-	--header-lines=2 \
+	--header="$(echo -e '\n Select packages to print info\n (use TAB to toggle selection)\n\n')" \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
-	--cycle |
+	--cycle \
+	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
+	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+	--bind 'ctrl-/:change-preview-window(hidden|)' \
+	--bind ctrl-n:next-selected,ctrl-b:prev-selected |
+	awk '{print $1}' |
 	xargs -ro pacman -Qik
 }

 #	Remove installed pkgs
 Remove() {
-	sort <(pacman -Qqs) > /tmp/installed_packages
-	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /tmp/installed_packages
-	cat /tmp/installed_packages |
+	expac '%-20n\t%d' |
 	fzf -q "$1" -e -m \
 	--preview='cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null || paru -Qi {1}) <(pacman -Ql {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 -Rsn
-}
-
-### AUR
-#	Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install
-Aur() {
-	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} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
-	--preview-window=65%:wrap \
-	--layout=reverse \
-	--marker='>>' \
-	--header-lines=2 \
+  	--header="$(echo -e '\n Select packages to remove\n (use TAB to toggle selection)\n\n')" \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
 	--cycle \
+	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
+	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+	--bind 'ctrl-/:change-preview-window(hidden|)' \
+	--bind ctrl-n:next-selected,ctrl-b:prev-selected |
+	awk '{print $1}' |
+	xargs -ro sudo pacman -Rsn
+}
+
+#	Update installed pkgs
+Update() (
+	viewUpdates() {
+		fzf --preview='cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' \
+		--preview-window=65%:wrap \
+		--layout=reverse \
+		--marker='>>' \
+  		--header="$(echo -e '\nPackages with updates available:\n\n')" \
+		--info=hidden \
+		--ansi \
+		--margin="2%,1%,2%,1%" \
+		--cycle \
+		--bind 'focus:transform-preview-label:echo \
+		⌇ Commit History: https://gitlab.archlinux.org/archlinux/packaging/packages/{1}/-/commits/main ⌇' \
+		--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+		--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+		--bind 'ctrl-/:change-preview-window(hidden|)' \
+		--bind ctrl-n:next-selected,ctrl-b:prev-selected < /tmp/fpf-updates > /dev/null
+		[[ "$(printf '\nWould you like to update? [y/N]> ' >&2; read; echo $REPLY)" == [Nn]* ]] \
+  		&& printf "\nPlease update soon :(\n" || sudo pacman -Syu
+	}
+	checkupdates > "/tmp/fpf-updates"
+	[ -s "/tmp/fpf-updates" ] && viewUpdates ||
+	printf "\nThere are no available updates :)\n"
+)
+
+### AUR
+#	Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install
+Aur() {
+	AurFD	
+	fzf -q "$1" -e -m \
+	--preview='cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
+	--preview-window=55%:wrap:border-sharp \
+	--layout=reverse \
+	--marker='>>' \
+	--header="$(echo -e ' Select packages to install\n (use TAB to toggle selection)\n')" \
+	--info=hidden \
+	--ansi \
+	--margin="2%,1%,2%,1%" \
+	--cycle \
+	--tiebreak=begin,chunk,length \
+	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
+	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+	--bind ctrl-n:next-selected,ctrl-b:prev-selected \
+	--bind 'ctrl-/:change-preview-window(hidden|)' \
 	--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
-	--bind=ctrl-x:preview:'cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' |
+	--bind=ctrl-x:preview:'cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
+	< /tmp/aur/fpf-packages-meta |
+	awk '{print $1}' |
 	sed -e 's/\*$//' |
 	xargs -ro $AHELPR -S
 }

 #	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
-	cat /tmp/aur_installed_packages |
+	AurFD
+	while IFS= read -r pkgName; do
+	grep -w "^$pkgName " /tmp/aur/fpf-packages-meta >> /tmp/aur/fpf-installed
+	done < <(pacman -Qqm)
 	fzf -q "$1" -e -m \
 	--preview 'cat <(pacman -Qik {1}) <(echo "") <(pacman -Ql {1} | awk "{print \$2}")' \
 	--preview-window=65%:wrap \
 	--layout=reverse \
 	--marker='>>' \
-	--header-lines=2 \
+	--header="$(echo -e ' Select packages to print info\n (use TAB to toggle selection)\n')" \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
 	--cycle \
+	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
+	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+	--bind 'ctrl-/:change-preview-window(hidden|)' \
+	--bind ctrl-n:next-selected,ctrl-b:prev-selected \
 	--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
-	--bind=ctrl-x:preview:'cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null || paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' |
+	--bind=ctrl-x:preview:'cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null ||
+	paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
+	< /tmp/aur/fpf-installed |
+	awk '{print $1}' |
 	xargs -ro pacman -Qik
 }

+#	Update AUR installed pkgs
+UpdateAURpkgs() (
+	viewAURUpdates() {
+		fzf --preview='cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
+		--preview-window=65%:wrap \
+		--layout=reverse \
+		--marker='>>' \
+  		--header="$(echo -e '\nPackages with updates available:\n\n')" \
+		--info=hidden \
+		--ansi \
+		--margin="2%,1%,2%,1%" \
+		--cycle \
+		--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
+		--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+		--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+		--bind 'ctrl-/:change-preview-window(hidden|)' \
+		--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
+		--bind=ctrl-x:preview:'cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null ||
+		paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' < "/tmp/aur/fpf-updates" > /dev/null
+		[[ "$(printf '\nWould you like to update? [y/N]> ' >&2; read; echo $REPLY)" == [Nn]* ]] \
+  		&& printf "\nPlease update soon :(\n" || $AHELPRUPDATE
+		rm /tmp/aur/fpf-updates
+	}
+	while true; do printf "Reading updates" & eval "$(yay -a > /tmp/aur/fpf-yay & sleep ${1:-3})"; break; done
+	touch "/tmp/aur/fpf-updates"; grep '^[0-9]' "/tmp/aur/fpf-yay" | cut -c 8- > "/tmp/aur/fpf-updates"
+	[ -s "/tmp/aur/fpf-updates" ] && viewAURUpdates ||
+	printf "\nThere are no available updates :)\n"
+)
+
 ### ORPHANS
 #	List orphaned packages and remove selected 
 Orphans() {
-	sort <(pacman -Qtdq) > /tmp/orphaned
-	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/orphaned)" > /tmp/orphaned
-	cat /tmp/orphaned |
+	[ -f /tmp/fpf-orphans ] ||
+	while IFS= read -r pkgName; do
+	expac '%-20n\t%d' "$pkgName" >> /tmp/fpf-orphans
+	done < <(pacman -Qtdq)
 	fzf -q "$1" -e -m \
-	--preview='cat <(pacman -Qik {1} 2>/dev/null || yay -Qi {1} 2>/dev/null || paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
+	--preview='cat <(pacman -Qik {1} 2>/dev/null || yay -Qi {1} 2>/dev/null ||
+	paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
 	--preview-window=65%:wrap \
 	--layout=reverse \
 	--marker='>>' \
-	--header-lines=2 \
+	--header="$(echo -e ' Select packages to remove\n (use TAB to toggle selection)\n')" \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
-	--cycle |
+	--cycle \
+	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
+	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
+	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
+	--bind ctrl-n:next-selected,ctrl-b:prev-selected \
+	--bind 'ctrl-/:change-preview-window(hidden|)' \
+	< /tmp/fpf-orphans |
+	awk '{print $1}' |
 	xargs -ro sudo pacman -Rsn	
 }

@ -200,12 +324,20 @@ else
       		-R|--remove)
       			Remove "$2"
       			;;
+			-U|--update)
+       			Update
+       			;;
+			-Ua|--update-aur)
+       			UpdateAURpkgs "$2"
+       			;;
    		-h|--help)
       			Help
+				cat "/tmp/fpf-help"
       			;;       			
    		-*)
-       			echo "Invalid Usage"
-       			Help
+				Help
+				sed -i "2s/.*/Invalid Usage/" /tmp/fpf-help
+				head -n 13 "/tmp/fpf-help"
       			;;
    	esac
 	done
--- a/fpf.png
+++ b/fpf.png
--- a/212
+++ b/212
@ -1,212 +0,0 @@
-#!/usr/bin/bash
-
-### Help 
-Help() {
-    echo
-    echo "Use fzf to search and install with Pacman and Yay"
-    echo "Defaults to Pacman if no options passed"
-    echo
-    echo "Syntax: fpff -[a|l|la|R|o|h]"
-    echo
-    echo "options:"
-    echo
-    echo "a     Search/List and install from AUR with Yay"
-    echo
-    echo "l     Search/List installed packages from official repo"
-    echo
-    echo "la    Search/List installed packages only from AUR repo"
-    echo
-    echo "R     Search/List installed packages for removal"
-    echo
-    echo "o     Search/List orphaned packages for removal"
-    echo
-    echo "h     Print this help screen."
-    echo
-    echo " Bash/Zsh shell users should use \"fpf\" command instead"
-}
-
-#	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)
-    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; }
-}
-
-#	Check AUR helper
-AHELPR=""
-if [[ -z "$AHELPR" ]]
-then
-    if [[ -f /usr/bin/paru ]]
-    then 
-    	AHELPR="paru"
-    elif [[ -f /usr/bin/yay ]]
-    then
-    	AHELPR="yay"
-    else
-    	echo -e "Suitable AUR Helper not found.\nPlease install \"paru\" or \"yay\" to continue."
-		exit 1
-	fi
-fi
-
-### Official Repo
-#	Get Official package list, sort, mark installed, preview infos and finally hand off to pacman for install
-Official() {
-	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} | psub) (pacman -Fl {1} | awk "{print \$2}" | psub)' \
-  	--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
-Installed() {
-	sort <(pacman -Qqs) > /tmp/installed_packages
-	echo "$(echo -e ' Select packages to print info\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /tmp/installed_packages
-	cat /tmp/installed_packages |
-	fzf -q "$1" -e -m \
-	--preview='cat (pacman -Qik {1} | psub) (echo "" | psub) (pacman -Fl {1} | awk "{print \$2}" | psub)' \
-	--preview-window=65%:wrap \
-	--layout=reverse \
-	--marker='>>' \
-	--header-lines=2 \
-	--info=hidden \
-	--ansi \
-	--margin="2%,1%,2%,1%" \
-	--cycle |
-	xargs -ro pacman -Qik
-}
-
-#	Remove installed pkgs
-Remove() {
-	sort <(pacman -Qqs) > /tmp/installed_packages
-	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /tmp/installed_packages
-	cat /tmp/installed_packages |
-	fzf -q "$1" -e -m \
-	--preview='cat (pacman -Si {1} 2>/dev/null || yay -Qi {1} || paru -Qi {1}| psub) (pacman -Ql {1} | awk "{print \$2}" | psub)' \
-	--preview-window=65%:wrap \
-	--layout=reverse \
-	--marker='>>' \
-	--header-lines=2 \
-	--info=hidden \
-	--ansi \
-	--margin="2%,1%,2%,1%" \
-	--cycle |
-	xargs -ro sudo pacman -Rsn
-}
-
-### AUR
-#	Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install
-Aur() {
-	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} || paru -Si {1} | psub) (pacman -Ql {1} 2>/dev/null | awk "{print \$2}" | psub)' \
-	--preview-window=65%:wrap \
-	--layout=reverse \
-	--marker='>>' \
-	--header-lines=2 \
-	--info=hidden \
-	--ansi \
-	--margin="2%,1%,2%,1%" \
-	--cycle \
-	--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
-	--bind=ctrl-x:preview:'cat (yay -Si {1} || paru -Si {1} | psub) (pacman -Ql {1} 2>/dev/null | awk "{print \$2}" | psub)' |
-	sed -e 's/\*$//' |
-	xargs -ro $AHELPR -S
-}
-
-#	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
-	cat /tmp/aur_installed_packages |
-	fzf -q "$1" -e -m \
-	--preview 'cat (pacman -Qik {1} | psub) (echo "" | psub) (pacman -Ql {1} | awk "{print \$2}" | psub)' \
-	--preview-window=65%:wrap \
-	--layout=reverse \
-	--marker='>>' \
-	--header-lines=2 \
-	--info=hidden \
-	--ansi \
-	--margin="2%,1%,2%,1%" \
-	--cycle \
-	--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
-	--bind=ctrl-x:preview:'cat (pacman -Si {1} 2>/dev/null || yay -Qi {1} || paru -Qi {1} | psub) (pacman -Ql {1} | awk "{print \$2}" | psub)' |
-	xargs -ro pacman -Qik
-}
-
-### ORPHANS
-#	List orphaned packages and remove selected 
-Orphans() {
-	sort <(pacman -Qtdq) > /tmp/orphaned
-	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/orphaned)" > /tmp/orphaned
-	cat /tmp/orphaned |
-	fzf -q "$1" -e -m \
-	--preview='cat (pacman -Qik {1} 2>/dev/null || yay -Qi {1} || paru -Qi {1} | psub) (pacman -Ql {1} | awk "{print \$2}" | psub)' \
-	--preview-window=65%:wrap \
-	--layout=reverse \
-	--marker='>>' \
-	--header-lines=2 \
-	--info=hidden \
-	--ansi \
-	--margin="2%,1%,2%,1%" \
-	--cycle |
-	xargs -ro sudo pacman -Rsn	
-}
-
-### MAIN
-
-#	Update the files database
-UpdateInfos
-#   Test for AUR option, if not run with pacman
-if [[ ! "$1" =~ ^- ]]; then
-	Official "$1"
-else
-	for opt in "$@"; do
-		case $opt in
-    		-a|--aur)
-				Aur "$2"
-				;;
-       		-l|--list-installed)
-       			Installed "$2"
-       			;;
-       		-la|--list-aur-installed)
-       			AurInstalled "$2"
-       			;;
-       		-o|--orphans)
-       			Orphans "$2"
-       			;;
-       		-R|--remove)
-       			Remove "$2"
-       			;;
-    		-h|--help)
-       			Help
-       			;;       			
-    		-*) 
-       			echo "Invalid Usage"
-       			Help
-       			;;
-    	esac
-	done
-fi
Author	SHA1	Message	Date
Eric Lay	6612619a46	aur updater updated	2023-11-21 18:15:30 -06:00
Eric Lay	7a54204516	updating updater	2023-11-21 06:45:36 -06:00
Eric Lay	1012970b6b	updated updater	2023-11-20 21:50:24 -06:00
Eric Lay	24b86bb679	added Updater feature/refactor	2023-11-20 21:06:47 -06:00
Eric Lay	f2cd1219e8	update README	2023-11-20 18:19:27 -06:00
Eric Lay	f0e110187f	update screenshot	2023-11-20 18:15:59 -06:00
Eric Lay	2363392cb4	update README	2023-11-19 15:12:31 -06:00
Eric Lay	42f1fc9a96	update README	2023-11-19 15:11:37 -06:00
Eric Lay	b6af4c3c68	update README	2023-11-19 15:06:15 -06:00
Eric Lay	4bbe05cff7	update README	2023-11-19 15:05:19 -06:00
Eric Lay	e1a301eaeb	update README	2023-11-19 15:03:22 -06:00
Eric Lay	de87777fa1	Restructre and new keybinds	2023-11-19 13:13:20 -06:00
ericlay	5dab69ec94	updated PKGBUILD	2023-03-30 08:40:21 -05:00
ericlay	ad26ce2b17	updated result scoring for better matching with descriptions	2023-03-30 08:32:52 -05:00
ericlay	864c9b7430	updating PKGBUILD	2023-03-29 12:01:56 -05:00
Eric Lay	997ea2bd66	Merge pull request #7 from ericlay/dev VERSION 1.0 🥳	2023-03-29 15:22:52 -05:00
Eric Lay	3a710a3e13	Merge pull request #6 from ericlay/dev merging	2023-03-29 15:11:27 -05:00
ericlay	81aff500e1	VERSION 1.0 🥳	2023-03-29 10:20:03 -05:00
ericlay	1ba2367452	some refactoring and updating PKGBUILD/README	2023-03-29 10:04:06 -05:00
ericlay	043cdade9e	added installed markers to Aur search index	2023-03-27 13:56:01 -05:00
ericlay	7bb851a216	refactoring to work better with descriptions	2023-03-27 08:34:44 -05:00
ericlay	7749aa9fe9	stripped descriptions from passing to package manager	2023-03-26 14:29:16 -05:00
ericlay	20a1da6d98	added descriptions to AUR searchable index	2023-03-26 14:18:43 -05:00
ericlay	3dcbf20e37	added color to warning	2023-03-25 15:31:25 -05:00
ericlay	d3e0a02b6a	added descriptions to searchable index	2023-03-25 15:18:03 -05:00
Eric Lay	b5357d7fb4	change base to gawk function	2023-03-05 16:48:36 -06:00
Eric Lay	f54e900c47	setting up dev branch	2023-02-25 12:22:45 -06:00
Eric Lay	a58b3b09e2	Update README.md	2021-07-27 15:04:54 -05:00