From ac47ff9181f82602376dc809f7ec144807c995cd Mon Sep 17 00:00:00 2001
From: Erich Eckner <erich.eckner.ext@bestsecret.com>
Date: Tue, 23 May 2023 09:45:45 +0200
Subject: filter out lib32-* early

* otherwise, lib32-* packages are counted for -m, possibly leaving nothing left
---
 bin/get-package-updates | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/get-package-updates b/bin/get-package-updates
index 03ccdd2..7d1aff2 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -299,6 +299,7 @@ echo 'Check modified packages from the last update, and put them to the build li
 
 {
   directories=$(
+    # shellcheck disable=SC2154
     git -C "${repo_paths__state}" archive "${new_repo_revisions__state}" \
     | tar -t \
     | cut -d/ -f1 \
@@ -323,6 +324,7 @@ echo 'Check modified packages from the last update, and put them to the build li
   | sort -u \
   > "${tmp_dir}/mysql-packages"
   for directory in ${directories}; do
+    # shellcheck disable=SC2154
     git -C "${repo_paths__state}" archive "${new_repo_revisions__state}" -- "${directory}" \
     | tar -Ox \
     | cut -d' ' -f1,4 \
@@ -330,6 +332,7 @@ echo 'Check modified packages from the last update, and put them to the build li
       s@$@ '"${directory%-*}"'@
     '
   done \
+  | grep -v '^lib32-' \
   | sort -u \
   > "${tmp_dir}/upstream-packages"
   diff "${tmp_dir}/mysql-packages" "${tmp_dir}/upstream-packages" \
@@ -338,6 +341,7 @@ echo 'Check modified packages from the last update, and put them to the build li
   | sort -k2,2 -k3,3 \
   | uniq -uf1 \
   | while read -r git_revision pkgbase repository; do
+    # shellcheck disable=SC2154
     if git -C "${repo_paths__archlinux32}" archive "${new_repo_revisions__archlinux32}" -- "${repository}/${pkgbase}" >/dev/null 2>&1; then
       mod_git_revision="${new_repo_revisions__archlinux32}"
     else
@@ -419,9 +423,6 @@ diff "${tmp_dir}/mysql-packages" "${tmp_dir}/upstream-packages" \
   delete_package 'any' "${pkgbase}" "${repository}"
 done
 
-grep -v '^lib32-' "${tmp_dir}/modified-packages" \
-| sponge "${tmp_dir}/modified-packages"
-
 while read -r pkgbase repository git_revision mod_git_revision; do
   # shellcheck disable=SC2016
   {
-- 
cgit v1.2.3-54-g00ecf