From f54e900c470bce72a245823da3fa36940586423a Mon Sep 17 00:00:00 2001 From: Eric Lay Date: Sat, 25 Feb 2023 12:22:45 -0600 Subject: [PATCH 1/9] setting up dev branch --- fpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fpf b/fpf index 0693e7a..356a58c 100755 --- a/fpf +++ b/fpf @@ -55,7 +55,7 @@ fi # 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 + expac -H M '%-20n\t%d' $(sort <(comm -23 <(pacman -Slq | sort) <(pacman -Qq | sort)) <(comm -12 <(pacman -Slq | sort) <(pacman -Qq | sort) | awk '{print $0" \033[32m*\033[0m"}')) &>/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 \ From b5357d7fb4d064d2aaff0cee1d30718d8330f5f6 Mon Sep 17 00:00:00 2001 From: Eric Lay Date: Sun, 5 Mar 2023 16:48:36 -0600 Subject: [PATCH 2/9] change base to gawk function --- fpf | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/fpf b/fpf index 356a58c..dda3691 100755 --- a/fpf +++ b/fpf @@ -1,5 +1,11 @@ #!/usr/bin/bash +declare -r esc=$'\033' +declare -r c_reset="${esc}[0m" +declare -r c_red="${esc}[31m" +declare -r c_green="${esc}[32m" +declare -r c_blue="${esc}[34m" + ### Help Help() { echo @@ -54,21 +60,27 @@ 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..." - expac -H M '%-20n\t%d' $(sort <(comm -23 <(pacman -Slq | sort) <(pacman -Qq | sort)) <(comm -12 <(pacman -Slq | sort) <(pacman -Qq | sort) | awk '{print $0" \033[32m*\033[0m"}')) &>/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}")' \ - --preview-window=65%:wrap \ + --preview='cat <(pacman -Si {2}) <(pacman -Fl {2} | awk "{print \$2}")' \ + --preview-window=55%:wrap:border-sharp \ + --preview-label="| Package Information |" \ --layout=reverse \ --marker='>>' \ - --header-lines=2 \ + --header=" Select packages to install (use TAB to toggle selection)" \ --info=hidden \ --ansi \ --margin="2%,1%,2%,1%" \ - --cycle | - sed -e 's/\*$//' | + --cycle \ + < <( sort -k2 <( pacman -Ss "$1" | + gawk '{ + getline descr; + sub(/ */,"", descr); + repo = blue "[" gensub(/\/.*/, "", 1) "]" reset; + name = green gensub(/.*\//, "", 1, $1) reset; + info = gensub(/[^ ]* /, "", 1); + print repo, name, info, descr; + }' blue="$c_blue" green="$c_green" reset="$c_reset" + )) | cut -d' ' -f2 | xargs -ro sudo pacman -S } From d3e0a02b6abcf3fe967c4bf40cdd5095a4a37167 Mon Sep 17 00:00:00 2001 From: ericlay Date: Sat, 25 Mar 2023 15:18:03 -0500 Subject: [PATCH 3/9] added descriptions to searchable index --- fpf | 63 +++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/fpf b/fpf index dda3691..63926e3 100755 --- a/fpf +++ b/fpf @@ -1,11 +1,5 @@ #!/usr/bin/bash -declare -r esc=$'\033' -declare -r c_reset="${esc}[0m" -declare -r c_red="${esc}[31m" -declare -r c_green="${esc}[32m" -declare -r c_blue="${esc}[34m" - ### Help Help() { echo @@ -25,6 +19,8 @@ Help() { echo "R Search/List installed packages for removal" echo echo "o Search/List orphaned packages for removal" + echo + echo "u Update Aur package descriptions list" echo echo "h Print this help screen." echo @@ -41,6 +37,23 @@ UpdateInfos() { [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Files database is out of date\nSyncing now..."; sudo pacman -Fy; } } +# Build descriptions list for AUR packages +AurList() { + echo -e "\n Updating AUR package descriptions list\n WARNING! CAUTION! CUIDADO!\n Will take 5 to 10 minutes depending on your machine\n\n" + rm -f /tmp/aur/packages-descriptions-meta + zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | jq --compact-output '.[] | {Name, Version, Description, Keywords, PackageBase, URL, Popularity, OutOfDate, Maintainer, FirstSubmitted, LastModified, Depends, MakeDepends, License}' | perl -pe 's/^\{\"|\"?,"(?![^:]+\])/\n/g' | perl -pe 's/\\(?=")|\"(?=:)|:\K\[?\"\[?\"?|\"?\]\}?$//gm' | perl -pe 's/\",\" ?/ /gm' | perl -pe 's/^([^:]+)(:)(.*)$/$1 $2 $3/gm' | perl -pe 's/^.{16}\K +//gm' | perl -0777 -pe 's/\n+(?=Name)/\n\n\nRepository : AUR\n/gm' > /tmp/aur/packages-extracted-meta + inputF="/tmp/aur/packages" + block() { + dataF="/tmp/aur/packages-extracted-meta" + endF="/tmp/aur/packages-descriptions-list" + pkgName="$1" + description="$(grep -A 2 $pkgName $dataF | grep -m 1 Description | awk -F" :" '{print $2}')" + printf '%s\t%s\n' "$pkgName" "$description" >> "$endF" + } + export -f block + cat "$inputF" | parallel -j 250 block +} + # Check AUR helper AHELPR="" if [[ -z "$AHELPR" ]] @@ -60,27 +73,22 @@ 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 <(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 {2}) <(pacman -Fl {2} | awk "{print \$2}")' \ + --preview='cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' \ --preview-window=55%:wrap:border-sharp \ --preview-label="| Package Information |" \ --layout=reverse \ --marker='>>' \ - --header=" Select packages to install (use TAB to toggle selection)" \ + --header-lines=2 \ --info=hidden \ --ansi \ --margin="2%,1%,2%,1%" \ - --cycle \ - < <( sort -k2 <( pacman -Ss "$1" | - gawk '{ - getline descr; - sub(/ */,"", descr); - repo = blue "[" gensub(/\/.*/, "", 1) "]" reset; - name = green gensub(/.*\//, "", 1, $1) reset; - info = gensub(/[^ ]* /, "", 1); - print repo, name, info, descr; - }' blue="$c_blue" green="$c_green" reset="$c_reset" - )) | cut -d' ' -f2 | + --cycle | + sed -e 's/\*$//' | xargs -ro sudo pacman -S } @@ -124,14 +132,16 @@ Remove() { # 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) + [ -f /tmp/aur/packages-extracted-meta ] || { echo -e "Syncing AUR package database...\nCAUTION: This WILL take possibly 5 to 30 minutes depending on your machine"; 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; AurList; } + d1=$(stat -c %y /tmp/aur/packages-extracted-meta) 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 | +# [[ "${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; } + [[ "${d2///-/}" > "${d1//-/}" ]] && echo -e "Aur package info database out of date\nConsider updating (fpf -u)\nCAUTION: WILL take a long time\nConsider switching to a service unit" && sleep 1 +# 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 -o /tmp/aur/packages-descriptions-list{,} + echo "$(echo -e ' Select packages to install\n (use TAB to toggle selection)'; cat /tmp/aur/packages-descriptions-list)" > /tmp/aur/packages-descriptions-list + cat /tmp/aur/packages-descriptions-list | 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 \ @@ -212,6 +222,9 @@ else -R|--remove) Remove "$2" ;; + -u|--update) + AurList + ;; -h|--help) Help ;; From 3dcbf20e37a1d94a05be480d6f94c6a3bc9d5e36 Mon Sep 17 00:00:00 2001 From: ericlay Date: Sat, 25 Mar 2023 15:31:25 -0500 Subject: [PATCH 4/9] added color to warning --- fpf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fpf b/fpf index 63926e3..5ceb03e 100755 --- a/fpf +++ b/fpf @@ -1,5 +1,9 @@ #!/usr/bin/bash +declare -r esc=$'\033' +declare -r c_reset="${esc}[0m" +declare -r c_red="${esc}[31m" + ### Help Help() { echo @@ -39,7 +43,8 @@ UpdateInfos() { # Build descriptions list for AUR packages AurList() { - echo -e "\n Updating AUR package descriptions list\n WARNING! CAUTION! CUIDADO!\n Will take 5 to 10 minutes depending on your machine\n\n" + echo -e "\n\n Updating AUR package descriptions list" + echo -e ""$c_red" WARNING! CAUTION! CUIDADO!\n Will take 5 to 10 minutes depending on your machine\n\n "$c_reset"" rm -f /tmp/aur/packages-descriptions-meta zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | jq --compact-output '.[] | {Name, Version, Description, Keywords, PackageBase, URL, Popularity, OutOfDate, Maintainer, FirstSubmitted, LastModified, Depends, MakeDepends, License}' | perl -pe 's/^\{\"|\"?,"(?![^:]+\])/\n/g' | perl -pe 's/\\(?=")|\"(?=:)|:\K\[?\"\[?\"?|\"?\]\}?$//gm' | perl -pe 's/\",\" ?/ /gm' | perl -pe 's/^([^:]+)(:)(.*)$/$1 $2 $3/gm' | perl -pe 's/^.{16}\K +//gm' | perl -0777 -pe 's/\n+(?=Name)/\n\n\nRepository : AUR\n/gm' > /tmp/aur/packages-extracted-meta inputF="/tmp/aur/packages" From 20a1da6d9819bd43504a48b6c0aba7ca846559a5 Mon Sep 17 00:00:00 2001 From: ericlay Date: Sun, 26 Mar 2023 14:18:43 -0500 Subject: [PATCH 5/9] added descriptions to AUR searchable index --- fpf | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/fpf b/fpf index 5ceb03e..9c24e56 100755 --- a/fpf +++ b/fpf @@ -41,24 +41,6 @@ UpdateInfos() { [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Files database is out of date\nSyncing now..."; sudo pacman -Fy; } } -# Build descriptions list for AUR packages -AurList() { - echo -e "\n\n Updating AUR package descriptions list" - echo -e ""$c_red" WARNING! CAUTION! CUIDADO!\n Will take 5 to 10 minutes depending on your machine\n\n "$c_reset"" - rm -f /tmp/aur/packages-descriptions-meta - zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | jq --compact-output '.[] | {Name, Version, Description, Keywords, PackageBase, URL, Popularity, OutOfDate, Maintainer, FirstSubmitted, LastModified, Depends, MakeDepends, License}' | perl -pe 's/^\{\"|\"?,"(?![^:]+\])/\n/g' | perl -pe 's/\\(?=")|\"(?=:)|:\K\[?\"\[?\"?|\"?\]\}?$//gm' | perl -pe 's/\",\" ?/ /gm' | perl -pe 's/^([^:]+)(:)(.*)$/$1 $2 $3/gm' | perl -pe 's/^.{16}\K +//gm' | perl -0777 -pe 's/\n+(?=Name)/\n\n\nRepository : AUR\n/gm' > /tmp/aur/packages-extracted-meta - inputF="/tmp/aur/packages" - block() { - dataF="/tmp/aur/packages-extracted-meta" - endF="/tmp/aur/packages-descriptions-list" - pkgName="$1" - description="$(grep -A 2 $pkgName $dataF | grep -m 1 Description | awk -F" :" '{print $2}')" - printf '%s\t%s\n' "$pkgName" "$description" >> "$endF" - } - export -f block - cat "$inputF" | parallel -j 250 block -} - # Check AUR helper AHELPR="" if [[ -z "$AHELPR" ]] @@ -137,16 +119,23 @@ Remove() { # 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-extracted-meta ] || { echo -e "Syncing AUR package database...\nCAUTION: This WILL take possibly 5 to 30 minutes depending on your machine"; 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; AurList; } - d1=$(stat -c %y /tmp/aur/packages-extracted-meta) +# [ -f /tmp/aur/packages-meta ] || { 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; AurList; } + [ -f /tmp/aur/packages-meta ] || { echo -e "Syncing AUR package database"; zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | + jq --compact-output '.[] | + { Name, Description } ' | + awk -F'"' -v OFS='\t\t' '{print $4, $8}'> /tmp/aur/packages-meta; } + d1=$(stat -c %y /tmp/aur/packages-meta) 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; } - [[ "${d2///-/}" > "${d1//-/}" ]] && echo -e "Aur package info database out of date\nConsider updating (fpf -u)\nCAUTION: WILL take a long time\nConsider switching to a service unit" && sleep 1 + [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Syncing AUR package database..."; zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | + jq --compact-output '.[] | + { Name, Description } ' | + awk -F'"' -v OFS='\t\t' '{print $4, $8}'> /tmp/aur/packages-meta; } # 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 -o /tmp/aur/packages-descriptions-list{,} - echo "$(echo -e ' Select packages to install\n (use TAB to toggle selection)'; cat /tmp/aur/packages-descriptions-list)" > /tmp/aur/packages-descriptions-list - cat /tmp/aur/packages-descriptions-list | + sort -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 + 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 \ From 7749aa9fe9bf8817d327f5fba541a5f66d7cada5 Mon Sep 17 00:00:00 2001 From: ericlay Date: Sun, 26 Mar 2023 14:29:16 -0500 Subject: [PATCH 6/9] stripped descriptions from passing to package manager --- fpf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fpf b/fpf index 9c24e56..efa392d 100755 --- a/fpf +++ b/fpf @@ -75,6 +75,7 @@ Official() { --ansi \ --margin="2%,1%,2%,1%" \ --cycle | + awk '{print $1}' | sed -e 's/\*$//' | xargs -ro sudo pacman -S } @@ -148,6 +149,7 @@ Aur() { --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} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' | + awk '{print $1}' | sed -e 's/\*$//' | xargs -ro $AHELPR -S } From 7bb851a21621f026bd07106d66c351e8790660fd Mon Sep 17 00:00:00 2001 From: ericlay Date: Mon, 27 Mar 2023 08:34:44 -0500 Subject: [PATCH 7/9] refactoring to work better with descriptions --- fpf | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/fpf b/fpf index efa392d..18b9fc6 100755 --- a/fpf +++ b/fpf @@ -41,6 +41,16 @@ UpdateInfos() { [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Files database is out of date\nSyncing now..."; sudo pacman -Fy; } } +UpdateAurInfos() { + [ -f /tmp/aur/packages-meta ] || { echo -e "Syncing AUR package database..."; zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | + jq --compact-output '.[] | + { Name, Description } ' | + awk -F'"' '{ printf "%-20s %s\n", $4, $8}'> /tmp/aur/packages-meta; } +# 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 -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 AHELPR="" if [[ -z "$AHELPR" ]] @@ -120,22 +130,11 @@ Remove() { # 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 ] || { 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; AurList; } - [ -f /tmp/aur/packages-meta ] || { echo -e "Syncing AUR package database"; zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | - jq --compact-output '.[] | - { Name, Description } ' | - awk -F'"' -v OFS='\t\t' '{print $4, $8}'> /tmp/aur/packages-meta; } + [ -f /tmp/aur/packages-meta ] || UpdateAurInfos d1=$(stat -c %y /tmp/aur/packages-meta) 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; } - [[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Syncing AUR package database..."; zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | - jq --compact-output '.[] | - { Name, Description } ' | - awk -F'"' -v OFS='\t\t' '{print $4, $8}'> /tmp/aur/packages-meta; } -# 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 -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 + [[ "${d2///-/}" > "${d1//-/}" ]] && UpdateAurInfos 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}")' \ @@ -218,9 +217,6 @@ else -R|--remove) Remove "$2" ;; - -u|--update) - AurList - ;; -h|--help) Help ;; From 043cdade9ef65b8733f2b53cd9fcf29d9c48d95f Mon Sep 17 00:00:00 2001 From: ericlay Date: Mon, 27 Mar 2023 13:56:01 -0500 Subject: [PATCH 8/9] added installed markers to Aur search index --- fpf | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/fpf b/fpf index 18b9fc6..c9cdd25 100755 --- a/fpf +++ b/fpf @@ -1,9 +1,5 @@ #!/usr/bin/bash -declare -r esc=$'\033' -declare -r c_reset="${esc}[0m" -declare -r c_red="${esc}[31m" - ### Help Help() { echo @@ -23,8 +19,6 @@ Help() { echo "R Search/List installed packages for removal" echo echo "o Search/List orphaned packages for removal" - echo - echo "u Update Aur package descriptions list" echo echo "h Print this help screen." echo @@ -42,12 +36,15 @@ UpdateInfos() { } UpdateAurInfos() { - [ -f /tmp/aur/packages-meta ] || { echo -e "Syncing AUR package database..."; zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | + echo -e "\nSyncing AUR package database...\n" + zcat <(curl https://aur.archlinux.org/packages-meta-ext-v1.json.gz) | jq --compact-output '.[] | { Name, Description } ' | - awk -F'"' '{ printf "%-20s %s\n", $4, $8}'> /tmp/aur/packages-meta; } -# 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 -o /tmp/aur/packages-meta{,} + awk -F'"' '{ printf "%-20s\t%s\n", $4, $8}' > /tmp/aur/packages-meta + while IFS= read -r pkgName; do + 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 } From 1ba23674527591d8f5a87432c952e5c036d80c88 Mon Sep 17 00:00:00 2001 From: ericlay Date: Wed, 29 Mar 2023 10:04:06 -0500 Subject: [PATCH 9/9] some refactoring and updating PKGBUILD/README --- PKGBUILD | 9 ++- README.md | 4 -- fpf | 46 +++++------- fpff | 212 ------------------------------------------------------ 4 files changed, 23 insertions(+), 248 deletions(-) delete mode 100755 fpff diff --git a/PKGBUILD b/PKGBUILD index 1495b7e..59cdf74 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: Eric Lay +# 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" } diff --git a/README.md b/README.md index 862a34c..b97fe1b 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/fpf b/fpf index c9cdd25..fbb8569 100755 --- a/fpf +++ b/fpf @@ -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,19 +115,18 @@ 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}" d2=$(date -I'date') - [[ "${d2///-/}" > "${d1//-/}" ]] && UpdateAurInfos + [[ "${d2///-/}" > "${d1//-/}" ]] && UpdateAurInfos 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%" \ diff --git a/fpff b/fpff deleted file mode 100755 index c10f40a..0000000 --- a/fpff +++ /dev/null @@ -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