From 693c0311248be835f82d8f783628af334e9580e6 Mon Sep 17 00:00:00 2001
From: DarkFeather <ircs://aninix.net:6697/DarkFeather>
Date: Thu, 16 Nov 2023 13:15:24 -0600
Subject: [PATCH] Adding fixes for PKGBUILDs -- better output from hook & that
 arrays are whitespace delimited

---
 Hooks/scripts.d/check-AniNIX-PKGBUILD | 21 +++++++++++++--------
 PKGBUILD                              |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Hooks/scripts.d/check-AniNIX-PKGBUILD b/Hooks/scripts.d/check-AniNIX-PKGBUILD
index 2eda523..47aa80c 100755
--- a/Hooks/scripts.d/check-AniNIX-PKGBUILD
+++ b/Hooks/scripts.d/check-AniNIX-PKGBUILD
@@ -1,15 +1,20 @@
 #!/bin/bash
 
 # Ensure that the following lines match the base PKGBUILD
-retcode=0
-(for term in pkgname replaces pkgver epoch pkgdesc url license ../LICENSE; do
-    current="$(grep "${term}" ./PKGBUILD)"
-    reference="$(grep "${term}" /opt/aninix/Uniglot/pacman/PKGBUILD)"
-    diff <(printf "${reference}") <(echo "${current}")S
-    retcode="$(( $retcode || $? ))";
-done) &>/dev/null
 
-if [ "$(basename "$0")" == 'Uniglot' ] && [ "$retcode" != 0 ]; then
+export retcode=0
+for term in pkgname replaces pkgver epoch pkgdesc url license ../LICENSE; do
+    current="$(grep -E "^${term}=" ./PKGBUILD)"
+    reference="$(grep -E "^${term}=" /opt/aninix/Uniglot/pacman/PKGBUILD)"
+    diff -w --color=always <(printf "${reference}") <(echo "${current}")
+    export retcode="$(( $retcode || $? ))";
+    if [ "$retcode" != 0 ]; then
+        echo "$term has delta."
+        break;
+    fi
+done
+
+if [ "$(basename "$PWD")" == 'Uniglot' ] && [ "$retcode" != 0 ]; then
     if [ ! -f /opt/aninix/Uniglot/pacman/PKGBUILD ]; then
         # Suppress output for this package when it isn't installed yet.
         echo $0
diff --git a/PKGBUILD b/PKGBUILD
index 98f7d94..6feb84b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ license=('custom')
 groups=()
 provides=("${pkgname}")
 conflicts=()
-replaces=("${pkgname,,}", "aninix-${pkgname,,}")
+replaces=("${pkgname,,}" "aninix-${pkgname,,}")
 backup=()
 options=()
 install=