README.md

@@ -6,14 +6,14 @@
 
 **Simple cli utility using fzf to search and install/list/remove packages.**\
  \
-![Screenshot](https://raw.githubusercontent.com/ericlay/fuzzy-pkg-finder/master/fpf.png) \
+![Screenshot](https://gitlab.com/airclay/fuzzy-pkg-finder/-/raw/master/fpf.png) \
  \
 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.*\
  \
-There are countless fzf package manager wrappers out there, some much more built out that this. \
+ 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
@@ -21,8 +21,6 @@ What separates Fuzzy-pkg-finder?
 - 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 \
- \
  \
 Installation: \
 For Arch and arch-based distros, it is available in the AUR. \
@@ -38,7 +36,7 @@ makepkg -sric
 Usage: 
 ```
 Syntax: fpf [-a| --aur] [-l| --list-installed] [-la| --list-aur-installed]
-              [R| --remove] [-o| --orphans] [-U | --update] [-h | --help]
+              [R| --remove] [-o| --orphans] [-h | --help]
 Defaults to Pacman if no options passed
 
 Searching for a package:
@@ -61,9 +59,6 @@ Options:
 -o, --orphans
      Search/List orphaned packages for removal
 
--U, --update
-     Shows packages with updates available
-
 -h, --help
      Print this help screen
 ```
@@ -72,7 +67,7 @@ Keybinds:
 ```
 'ctrl + /' Toggle the preview window
 'ctrl + h' Show help in the preview window
-'ctrl + k' Show the keybinds in the preview window
+'ctrl + k' Show the keybinds in teh preview window
 'ctrl + n' Move to the next selected item
 'ctrl + b' Back to previoius selected item
 

fpf

@@ -14,7 +14,6 @@ Help() {
 	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"
 }
 
@@ -42,6 +41,7 @@ UpdateInfos() {
 }
 
 UpdateAurInfos() {
+	printf "Syncing AUR package information..."
 	[[ ! -d /tmp/aur ]] && mkdir -p /tmp/aur
 	zcat <(curl  https://aur.archlinux.org/packages-meta-ext-v1.json.gz) |
 	jq --compact-output '.[] |
@@ -55,45 +55,30 @@ UpdateAurInfos() {
 	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
     	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() {
 	printf "Setting things up..."
+	KBINDS
 	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
+  	cat /tmp/fpf-packages |
   	fzf -q "$1" -e -m \
   	--preview='cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' \
   	--preview-window=55%:wrap:border-sharp \
@@ -109,7 +94,7 @@ Official() {
 	--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 |
+	--bind ctrl-n:next-selected,ctrl-b:prev-selected |
   	awk '{print $1}' |
   	sed -e 's/\*$//' |
   	xargs -ro sudo pacman -S
@@ -117,13 +102,16 @@ Official() {
 
 #	List installed pkgs
 Installed() {
-	expac '%-20n\t%d' |
+	sort <(pacman -Qqn) > /tmp/fpf-installed_packages
+	echo "$(echo -e ' Select packages to print info\n (use TAB to toggle selection)';
+	cat /tmp/fpf-installed_packages)" > /tmp/fpf-installed_packages
+	cat /tmp/fpf-installed_packages |
 	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="$(echo -e '\n Select packages to print info\n (use TAB to toggle selection)\n\n')" \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
@@ -133,19 +121,21 @@ Installed() {
 	--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() {
-	expac '%-20n\t%d' |
+	sort <(pacman -Qqs) > /tmp/fpf-installed_packages
+	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)';
+	cat /tmp/fpf-installed_packages)" > /tmp/fpf-installed_packages
+	cat /tmp/fpf-installed_packages |
 	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="$(echo -e '\n Select packages to remove\n (use TAB to toggle selection)\n\n')" \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
@@ -155,40 +145,18 @@ Remove() {
 	--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	
+	[ -f /tmp/aur/packages-meta ] || UpdateAurInfos
+	d1=$(stat -c %y /tmp/aur/fpf-packages-meta)
+	d1="${d1:0:10}"
+	d2=$(date -I'date')
+	[[ "${d2///-/}" > "${d1//-/}" ]] && UpdateAurInfos		
+	cat /tmp/aur/fpf-packages-meta |
 	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 \
@@ -206,8 +174,7 @@ Aur() {
 	--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
@@ -215,16 +182,16 @@ Aur() {
 
 #	List installed pkgs only from AUR
 AurInstalled() {
-	AurFD
+	sort <(pacman -Qqm) > /tmp/fpf-aur_installed_packages
-	while IFS= read -r pkgName; do
+	echo "$(echo -e ' Select packages to print info\n (use TAB to toggle selection)';
-	grep -w "^$pkgName " /tmp/aur/fpf-packages-meta >> /tmp/aur/fpf-installed
+	cat /tmp/fpf-aur_installed_packages)" > /tmp/fpf-aur_installed_packages
-	done < <(pacman -Qqm)
+	cat /tmp/fpf-aur_installed_packages |
 	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="$(echo -e ' Select packages to print info\n (use TAB to toggle selection)\n')" \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
@@ -236,55 +203,23 @@ AurInstalled() {
 	--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}")' \
+	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() {
-	[ -f /tmp/fpf-orphans ] ||
+	sort <(pacman -Qtdq) > /tmp/fpf-orphaned
-	while IFS= read -r pkgName; do
+	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/fpf-orphaned)" > /tmp/fpf-orphaned
-	expac '%-20n\t%d' "$pkgName" >> /tmp/fpf-orphans
+	cat /tmp/fpf-orphaned |
-	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-window=65%:wrap \
 	--layout=reverse \
 	--marker='>>' \
-	--header="$(echo -e ' Select packages to remove\n (use TAB to toggle selection)\n')" \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
@@ -293,9 +228,7 @@ Orphans() {
 	--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-/:change-preview-window(hidden|)'  |
-	< /tmp/fpf-orphans |
-	awk '{print $1}' |
 	xargs -ro sudo pacman -Rsn	
 }
 
@@ -324,12 +257,6 @@ else
        		-R|--remove)
        			Remove "$2"
        			;;
-			-U|--update)
-       			Update
-       			;;
-			-Ua|--update-aur)
-       			UpdateAURpkgs "$2"
-       			;;
     		-h|--help)
        			Help
 				cat "/tmp/fpf-help"