From f3a850992cf4252ecb413cafe8087ab29ac37725 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 5 Sep 2023 08:18:10 +0200
Subject: [PATCH] better check for package remove

---
 usr/bin/archboot-not-installed.sh             | 4 ++--
 usr/lib/initcpio/install/archboot_base_common | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/bin/archboot-not-installed.sh b/usr/bin/archboot-not-installed.sh
index eecf41125..d9efbbe27 100755
--- a/usr/bin/archboot-not-installed.sh
+++ b/usr/bin/archboot-not-installed.sh
@@ -10,7 +10,7 @@ pacman -Sy
 pacman -Q | cut -d ' ' -f1 >packages.txt
 #shellcheck disable=SC2013
 for i in $(cat packages.txt); do
-    rm -r /var/lib/pacman/local/"${i}"-[0-9]*
+    rm -r /var/lib/pacman/local/"${i}"-*-[0-9]*
 	#shellcheck disable=SC2086
     if pacman -Sdd ${i} --noconfirm 2>&1 >>log.txt; then
         echo "${i}" >> uninstalled.orig.txt
@@ -20,5 +20,5 @@ for i in $(cat packages.txt); do
     fi
 done
 # remove false positives
-grep -v -E "ca-certificates|iana-etc|linux-firmware-marvell|pambase|pacman-mirrorlist|licenses" uninstalled.orig.txt >uninstalled.txt
+grep -v -E "ca-certificates|iana-etc|linux-firmware-marvell|linux-firmware-whence|pambase|pacman-mirrorlist|licenses" uninstalled.orig.txt >uninstalled.txt
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/usr/lib/initcpio/install/archboot_base_common b/usr/lib/initcpio/install/archboot_base_common
index 22cb78ce8..106f92616 100644
--- a/usr/lib/initcpio/install/archboot_base_common
+++ b/usr/lib/initcpio/install/archboot_base_common
@@ -205,7 +205,7 @@ build ()
             cdrtools systemd-ukify python python-pefile limine man-pages libev libpipeline groff \
             man-db texinfo db db5.3 gc"
         for i in ${_RM_PACMAN_DB}; do
-            rm -rf "${BUILDROOT}"/var/lib/pacman/local/"${i}"-[0-9]* &>"${_NO_LOG}"
+            rm -rf "${BUILDROOT}"/var/lib/pacman/local/"${i}"-*-[0-9]* &>"${_NO_LOG}"
         done
     fi
     ### add nss p11-kit and ca certificates