ericlay
/
fuzzy-pkg-finder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some refactoring and updating PKGBUILD/README

This commit is contained in:
ericlay 2023-03-29 10:04:06 -05:00
parent 043cdade9e
commit 1ba2367452
4 changed files with 23 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PKGBUILD
View File

@ -1,6 +1,7 @@
# Maintainer: Eric Lay <ericlaytm@gmail.com>
# Contributor: Yochananmarqos
pkgname=fuzzy-pkg-finder
pkgver=0.9.6
pkgver=0.9.9
pkgrel=1
pkgdesc="Simple cli command for using fzf to search and install packages"
arch=('x86_64' 'aarch64' 'armv7h')
@ -8,7 +9,10 @@ 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')
@ -18,5 +22,4 @@ md5sums=('SKIP')
package() {
cd "$srcdir/$pkgname"
install -Dm755 fpf -t "$pkgdir/usr/bin"
install -Dm755 fpff -t "$pkgdir/usr/bin"
}

4
README.md
View File

@ -48,7 +48,3 @@ When browsing AUR or installed Aur pkgs:
'ctrl + p' Will preview the highlighted pkgbuild file
'ctrl + x' Will 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.

44
fpf
View File

@ -2,27 +2,17 @@
### 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"
echo -e "\nUse fzf to search and install with Pacman and Yay"
echo -e "Defaults to Pacman if no options passed\n"
echo -e "SYNTAX\n\tfpf [-a| --aur] [-l| --list-installed] [-la| --list-aur-installed]\n\t\t[R| --remove] [-o| --orphans] [-h | --help]\n"
echo -e "EXAMPLE\n\tfpf [pkg name] for official repo search\n\tfpf-a [pkg name] for aur search\n"
echo -e "OPTIONS"
echo -e "\t-a, --aur\n\t\tSearch/List and install from AUR with Yay\n"
echo -e "\t-l, --list-installed\n\t\tSearch/List installed packages from official repo\n"
echo -e "\t-la, --list-aur-installed\n\t\tSearch/List installed packages from AUR\n"
echo -e "\t-R, -remove\n\t\tSearch/List installed packages for removal\n"
echo -e "\t-o, --orphans\n\t\tSearch/List orphaned packages for removal\n"
echo -e "\t-h, --help\n\t\tPrint this help screen\n"
}
# Check things are up to date
@ -36,7 +26,8 @@ UpdateInfos() {
}
UpdateAurInfos() {
echo -e "\nSyncing AUR package database...\n"
echo -e "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 '.[] |
{ Name, Description } ' |
@ -45,7 +36,6 @@ UpdateAurInfos() {
grep -w "^$pkgName " /tmp/aur/packages-meta >> /tmp/aur/installed
done < <(pacman -Qqm)
sort <(comm -23 <(cat /tmp/aur/packages-meta | sort) <( cat /tmp/aur/installed | sort)) <(comm -12 <( cat /tmp/aur/packages-meta | sort) <(cat /tmp/aur/installed | sort) | awk -F"\t" '{print $1" \033[32m*\033[0m ", $2}') -o /tmp/aur/packages-meta
echo "$(echo -e ' Select packages to install\n (use TAB to toggle selection)'; cat /tmp/aur/packages-meta)" > /tmp/aur/packages-meta
}
# Check AUR helper
@ -69,7 +59,6 @@ fi
Official() {
echo "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/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}")' \
@ -77,7 +66,7 @@ Official() {
--preview-label="| Package Information |" \
--layout=reverse \
--marker='>>' \
--header-lines=2 \
--header="$(echo -e ' Select packages to install\n (use TAB to toggle selection)\n')" \
--info=hidden \
--ansi \
--margin="2%,1%,2%,1%" \
@ -126,7 +115,6 @@ Remove() {
### 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-meta ] || UpdateAurInfos
d1=$(stat -c %y /tmp/aur/packages-meta)
d1="${d1:0:10}"
@ -135,10 +123,10 @@ Aur() {
cat /tmp/aur/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=65%:wrap \
--preview-window=55%:wrap:border-sharp \
--layout=reverse \
--marker='>>' \
--header-lines=2 \
--header="$(echo -e ' Select packages to install\n (use TAB to toggle selection)\n')" \
--info=hidden \
--ansi \
--margin="2%,1%,2%,1%" \

212
fpff
View File

@ -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