From c747cdf2951aec8b9a0412c5b71c5e6dc5483821 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sat, 18 Sep 2021 22:02:28 +0200
Subject: [PATCH] config/shell/arch: adjustments in helpers

---
 .config/shell/arch         | 8 +++++---
 .local/bin/scripts/git-aur | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.config/shell/arch b/.config/shell/arch
index 071a388..00a1b6a 100644
--- a/.config/shell/arch
+++ b/.config/shell/arch
@@ -8,24 +8,26 @@ alias pacs='pac -Syu --needed'
 alias pacr='pac -R --recursive'
 alias yays='noglob yay -Sy --needed'
 alias yayr='noglob yay -R --cascade --recursive'
+alias yau='yay -Syu --sudoloop --nobatchinstall'
 
 yzf() {
   pos=$1
   shift
   sed "s/ /\t/g" |
-    fzf --nth=$pos --multi --history=/var/tmp/fzf-history-yzf$pos \
+    fzf --nth=$pos --multi --history="${FZF_HISTDIR:-$XDG_STATE_HOME/fzf}/history-yzf$pos" \
       --preview-window=60%,border-left \
-      --bind="double-click:execute(xdg-open 'https://archlinux.org/packages/{$pos}')" \
+      --bind="double-click:execute(xdg-open 'https://archlinux.org/packages/{$pos}'),alt-enter:execute(xdg-open 'https://aur.archlinux.org/packages?K={$pos}&SB=p&SO=d&PP=100')" \
        "$@" | cut -f$pos | xargs
 }
 
 # print -s adds a shell history entry
 yas() {
   cache_dir="/tmp/yas"
+  test "$1" = "-y" && rm -r "$cache_dir" && shift
   mkdir -p "$cache_dir"
   preview_cache="$cache_dir/preview_{2}"
   list_cache="$cache_dir/list"
-  pkg=$((cat "$list_cache$@" 2>/dev/null || { pacman --color=always -Sl "$@"; yay --color=always -Sl aur "$@" } | sed 's/ [^ ]*unknown-version[^ ]*//' | tee "$list_cache$@") |
+  pkg=$( (cat "$list_cache$@" 2>/dev/null || { pacman --color=always -Sl "$@"; yay --color=always -Sl aur "$@" } | sed 's/ [^ ]*unknown-version[^ ]*//' | tee "$list_cache$@") |
     yzf 2 --tiebreak=index --preview="cat $preview_cache 2>/dev/null | grep -v 'Querying' | grep . || yay --color always -Si {2} | tee $preview_cache")
   if test -n "$pkg"
     then echo "Installing $pkg..."
diff --git a/.local/bin/scripts/git-aur b/.local/bin/scripts/git-aur
index 8da099f..af72200 100755
--- a/.local/bin/scripts/git-aur
+++ b/.local/bin/scripts/git-aur
@@ -6,13 +6,16 @@ case $command in
     cd "$DATA/2-standards/dev/aur"
     git -c init.defaultBranch=master clone ssh://aur@aur.archlinux.org/$1.git
     cd "$1"
-    echo '*' > .gitignore
+    test -f PKGBUILD || sed "s/PKG/${1%%-git}/" ../PKGBUILD > PKGBUILD
+    test -f .gitignore || echo '*' > .gitignore
     exec $SHELL;;
   (create)
-    git add -f .gitignore PKGBUILD .SRCINFO
+    git add -f .gitignore PKGBUILD
     git commit -m "Create package" "$@"
     git aur push --amend;;
-  (push) makepkg --printsrcinfo > .SRCINFO
+  (push)
+    makepkg --printsrcinfo > .SRCINFO
+    git add -f .SRCINFO
     git commit -v -a "$@"
     git push;;
 esac