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

paru support

This commit is contained in:
airclay 2021-07-27 14:18:36 -05:00
parent d81662a531
commit ae291bb2db
4 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PKGBUILD
View File

@ -7,10 +7,11 @@ arch=('x86_64' 'aarch64' 'armv7h')
url="https://github.com/ericlay/$pkgname" url="https://github.com/ericlay/$pkgname"
license=('GPL3') license=('GPL3')
depends=('pacman' depends=('pacman'
'yay'
'fzf' 'fzf'
'wget') 'wget')
makedepends=('git') 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://gitlab.com/airclay/fuzzy-pkg-finder.git#tag=v$pkgver")
md5sums=('SKIP') md5sums=('SKIP')

8
README.md
View File

@ -11,9 +11,13 @@
Leverages the power of fzf to search package names and presents complete package information in preview pane. \ 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. \ On selection will hand off to Pacman or Yay to complete transaction. \
\ \
*For use with Pacman or Yay package managers only.*\ *For use with Pacman/Yay/Paru package managers only.*\
\ \
Installation: Installation: \
Arch and arch-based distros, it is available in the AUR. \
`paru -S fuzzy-pkg-finder` or `yay -S fuzzy-pkg-finder` \
\
Manual build and install: \
``` ```
git clone https://github.com/ericlay/fuzzy-pkg-finder git clone https://github.com/ericlay/fuzzy-pkg-finder
cd fuzzy-pkg-finder cd fuzzy-pkg-finder

30
fpf
View File

@ -25,7 +25,6 @@ Help() {
echo " Fish shell users should use \"fpff\" command instead" echo " Fish shell users should use \"fpff\" command instead"
} }
### Official Repo
# Check things are up to date # 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; }
@ -36,6 +35,23 @@ UpdateInfos() {
[[ "${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; }
} }
# 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 # Get Official package list, sort, mark installed, preview infos and finally hand off to pacman for install
Official() { Official() {
echo "Setting things up..." echo "Setting things up..."
@ -80,7 +96,7 @@ Remove() {
echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /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 | cat /tmp/installed_packages |
fzf -q "$1" -e -m \ fzf -q "$1" -e -m \
--preview='cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \ --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 \ --preview-window=65%:wrap \
--layout=reverse \ --layout=reverse \
--marker='>>' \ --marker='>>' \
@ -105,7 +121,7 @@ Aur() {
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 | cat /tmp/aur_packages |
fzf -q "$1" -e -m \ fzf -q "$1" -e -m \
--preview='cat <(yay -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \ --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=65%:wrap \
--layout=reverse \ --layout=reverse \
--marker='>>' \ --marker='>>' \
@ -115,9 +131,9 @@ Aur() {
--margin="2%,1%,2%,1%" \ --margin="2%,1%,2%,1%" \
--cycle \ --cycle \
--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \ --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}) <(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}")' |
sed -e 's/\*$//' | sed -e 's/\*$//' |
xargs -ro yay -S xargs -ro $AHELPR -S
} }
# List installed pkgs only from AUR # List installed pkgs only from AUR
@ -136,7 +152,7 @@ AurInstalled() {
--margin="2%,1%,2%,1%" \ --margin="2%,1%,2%,1%" \
--cycle \ --cycle \
--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \ --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}) <(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}")' |
xargs -ro pacman -Qik xargs -ro pacman -Qik
} }
@ -147,7 +163,7 @@ Orphans() {
echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/orphaned)" > /tmp/orphaned echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/orphaned)" > /tmp/orphaned
cat /tmp/orphaned | cat /tmp/orphaned |
fzf -q "$1" -e -m \ fzf -q "$1" -e -m \
--preview='cat <(pacman -Qik {1} 2>/dev/null || yay -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 \ --preview-window=65%:wrap \
--layout=reverse \ --layout=reverse \
--marker='>>' \ --marker='>>' \

32
fpff
View File

@ -6,7 +6,7 @@ Help() {
echo "Use fzf to search and install with Pacman and Yay" echo "Use fzf to search and install with Pacman and Yay"
echo "Defaults to Pacman if no options passed" echo "Defaults to Pacman if no options passed"
echo echo
echo "Syntax: fpf -[a|l|la|R|o|h]" echo "Syntax: fpff -[a|l|la|R|o|h]"
echo echo
echo "options:" echo "options:"
echo echo
@ -25,7 +25,6 @@ Help() {
echo " Bash/Zsh shell users should use \"fpf\" command instead" echo " Bash/Zsh shell users should use \"fpf\" command instead"
} }
### Official Repo
# Check things are up to date # 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; }
@ -36,6 +35,23 @@ UpdateInfos() {
[[ "${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; }
} }
# 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 # Get Official package list, sort, mark installed, preview infos and finally hand off to pacman for install
Official() { Official() {
echo "Setting things up..." echo "Setting things up..."
@ -80,7 +96,7 @@ Remove() {
echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /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 | cat /tmp/installed_packages |
fzf -q "$1" -e -m \ fzf -q "$1" -e -m \
--preview='cat (pacman -Si {1} 2>/dev/null || yay -Qi {1} | psub) (pacman -Ql {1} | awk "{print \$2}" | psub)' \ --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 \ --preview-window=65%:wrap \
--layout=reverse \ --layout=reverse \
--marker='>>' \ --marker='>>' \
@ -105,7 +121,7 @@ Aur() {
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 | cat /tmp/aur_packages |
fzf -q "$1" -e -m \ fzf -q "$1" -e -m \
--preview='cat (yay -Si {1} | psub) (pacman -Ql {1} 2>/dev/null | awk "{print \$2}" | psub)' \ --preview='cat (yay -Si {1} || paru -Si {1} | psub) (pacman -Ql {1} 2>/dev/null | awk "{print \$2}" | psub)' \
--preview-window=65%:wrap \ --preview-window=65%:wrap \
--layout=reverse \ --layout=reverse \
--marker='>>' \ --marker='>>' \
@ -115,9 +131,9 @@ Aur() {
--margin="2%,1%,2%,1%" \ --margin="2%,1%,2%,1%" \
--cycle \ --cycle \
--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \ --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} | psub) (pacman -Ql {1} 2>/dev/null | awk "{print \$2}" | psub)' | --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/\*$//' | sed -e 's/\*$//' |
xargs -ro yay -S xargs -ro $AHELPR -S
} }
# List installed pkgs only from AUR # List installed pkgs only from AUR
@ -136,7 +152,7 @@ AurInstalled() {
--margin="2%,1%,2%,1%" \ --margin="2%,1%,2%,1%" \
--cycle \ --cycle \
--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \ --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} | psub) (pacman -Ql {1} | awk "{print \$2}" | psub)' | --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 xargs -ro pacman -Qik
} }
@ -147,7 +163,7 @@ Orphans() {
echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/orphaned)" > /tmp/orphaned echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/orphaned)" > /tmp/orphaned
cat /tmp/orphaned | cat /tmp/orphaned |
fzf -q "$1" -e -m \ fzf -q "$1" -e -m \
--preview='cat (pacman -Qik {1} 2>/dev/null || yay -Qi {1} | psub) (pacman -Ql {1} | awk "{print \$2}" | psub)' \ --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 \ --preview-window=65%:wrap \
--layout=reverse \ --layout=reverse \
--marker='>>' \ --marker='>>' \