albertored11 · March 8, 2025 19:37 · Mar 17, 2021 · Mar 14, 2021 · Mar 14, 2021 · Dec 23, 2020
diff --git a/yaycache b/yaycache
@@ -20,7 +20,7 @@ for pkgdir in "$cachedir"/*/; do
         pkgver="$(pacman -Q $pkgname | cut -d ' ' -f2 | cut -d '-' -f1 | cut -d ':' -f2)"
 
         cd "$pkgdir"
-        rm -f "$(git ls-files --others | grep -v -e '^.*\.pkg\.tar.*$' -e '^.*/$' -e "^.*$pkgver.*$" | xargs -r printf "$pkgdir/%s\n")"
+        rm -f $(git ls-files --others | grep -v -e '^.*\.pkg\.tar.*$' -e '^.*/$' -e "^.*$pkgver.*$" | xargs -r printf "$pkgdir/%s\n")
 
     fi
 

diff --git a/yaycache b/yaycache
@@ -28,6 +28,7 @@ for pkgdir in "$cachedir"/*/; do
 
 done
 
-# Keep latest version for uninstalled native packages, keep two latest versions for installed packages
+# Remove everything for uninstalled foreign packages, keep latest version for uninstalled native packages, keep two latest versions for installed packages
+/usr/bin/paccache -qruk0 $pkgcache
 /usr/bin/paccache -qruk1
 /usr/bin/paccache -qrk2 -c /var/cache/pacman/pkg $pkgcache
diff --git a/yaycache b/yaycache
@@ -3,23 +3,31 @@
 # Assuming yay is run by user with UID 1000
 admin="$(id -nu 1000)"
 cachedir="/home/$admin/.cache/yay"
-removed="$(comm -23 <(find $cachedir -mindepth 1 -maxdepth 1 -type d | cut -d / -f6 | sort) <(pacman -Qqm) | xargs -r printf "$cachedir/%s\n")"
+removed="$(comm -23 <(basename -a $(find $cachedir -mindepth 1 -maxdepth 1 -type d) | sort) <(pacman -Qqm) | xargs -r printf "$cachedir/%s\n")"
 
-# Remove yay cache for foreign packages that are not installed anymore 
+# Remove yay cache for foreign packages that are not installed anymore
 rm -rf $removed
 
 pkgcache="$(find $cachedir -mindepth 1 -maxdepth 1 -type d | xargs -r printf "-c %s\n")"
 
-for pkgdir in $cachedir/*/; do
-    pkgname="$(echo $pkgdir | cut -d '/' -f6)"
-    pkgver="$(pacman -Q $pkgname | cut -d ' ' -f2 | cut -d '-' -f1)"
-    cd $pkgdir
-    # Remove untracked files (e. g. source/build files) excepting package files and main source files for installed version
-    rm -f $(git ls-files --others | grep -v -e '^.*\.pkg\.tar.*$' -e '^.*/$' -e "^.*$pkgver.*$" | xargs -r printf "$pkgdir%s\n")
-    rm -rf src/
+for pkgdir in "$cachedir"/*/; do
+
+    pkgname=$(basename "$pkgdir")
+
+    # Remove untracked files (e. g. source/build files) excepting package files and main source files for installed version if non-git package
+    if [[ ! "$pkgname" =~ ^.*-git$ ]]; then
+
+        pkgver="$(pacman -Q $pkgname | cut -d ' ' -f2 | cut -d '-' -f1 | cut -d ':' -f2)"
+
+        cd "$pkgdir"
+        rm -f "$(git ls-files --others | grep -v -e '^.*\.pkg\.tar.*$' -e '^.*/$' -e "^.*$pkgver.*$" | xargs -r printf "$pkgdir/%s\n")"
+
+    fi
+
+    rm -rf "$pkgdir"/src/
+
 done
 
-# Remove everything for uninstalled foreign packages, keep latest version for uninstalled native packages, keep two latest versions for installed packages
-/usr/bin/paccache -qruk0 $pkgcache
+# Keep latest version for uninstalled native packages, keep two latest versions for installed packages
 /usr/bin/paccache -qruk1
-/usr/bin/paccache -qrk2 -c /var/cache/pacman/pkg $pkgcache
+/usr/bin/paccache -qrk2 -c /var/cache/pacman/pkg $pkgcache
diff --git a/yaycache.hook b/yaycache.hook
@@ -8,4 +8,4 @@ Target = *
 Description = Cleaning pacman and yay cache...
 When = PostTransaction
 Exec = /home/herbort/.local/bin/yaycache
-Depends = pacman-contrib
+Depends = pacman-contrib
diff --git a/yaycache.hook b/yaycache.hook
@@ -7,5 +7,5 @@ Target = *
 [Action]
 Description = Cleaning pacman and yay cache...
 When = PostTransaction
-Exec = /home/herbort/.local/bin/yaycache.sh
+Exec = /home/herbort/.local/bin/yaycache
 Depends = pacman-contrib
diff --git a/yaycache.sh → yaycache b/yaycache.sh → yaycache
diff --git a/yaycache.hook b/yaycache.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Upgrade
+Operation = Remove
+Type = Package
+Target = *
+
+[Action]
+Description = Cleaning pacman and yay cache...
+When = PostTransaction
+Exec = /home/herbort/.local/bin/yaycache.sh
+Depends = pacman-contrib
diff --git a/yaycache.sh b/yaycache.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Assuming yay is run by user with UID 1000
+admin="$(id -nu 1000)"
+cachedir="/home/$admin/.cache/yay"
+removed="$(comm -23 <(find $cachedir -mindepth 1 -maxdepth 1 -type d | cut -d / -f6 | sort) <(pacman -Qqm) | xargs -r printf "$cachedir/%s\n")"
+
+# Remove yay cache for foreign packages that are not installed anymore 
+rm -rf $removed
+
+pkgcache="$(find $cachedir -mindepth 1 -maxdepth 1 -type d | xargs -r printf "-c %s\n")"
+
+for pkgdir in $cachedir/*/; do
+    pkgname="$(echo $pkgdir | cut -d '/' -f6)"
+    pkgver="$(pacman -Q $pkgname | cut -d ' ' -f2 | cut -d '-' -f1)"
+    cd $pkgdir
+    # Remove untracked files (e. g. source/build files) excepting package files and main source files for installed version
+    rm -f $(git ls-files --others | grep -v -e '^.*\.pkg\.tar.*$' -e '^.*/$' -e "^.*$pkgver.*$" | xargs -r printf "$pkgdir%s\n")
+    rm -rf src/
+done
+
+# Remove everything for uninstalled foreign packages, keep latest version for uninstalled native packages, keep two latest versions for installed packages
+/usr/bin/paccache -qruk0 $pkgcache
+/usr/bin/paccache -qruk1
+/usr/bin/paccache -qrk2 -c /var/cache/pacman/pkg $pkgcache
No results found