From 86d0ba70844e8091726e38c30a82ebb97cdfe9e4 Mon Sep 17 00:00:00 2001
From: Bryan Joshua Pedini <bryan@pedini.dev>
Date: Wed, 12 Mar 2025 21:48:52 +0100
Subject: [PATCH] added pkgrel to commit message, added curly brackets to all
 variables

---
 push.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/push.sh b/push.sh
index 5372b28..1a11688 100755
--- a/push.sh
+++ b/push.sh
@@ -3,13 +3,13 @@
 # Get version
 oldver=$(grep "pkgver=" PKGBUILD | sed 's/pkgver="//;s/"//')
 if [ $# -eq 1 ]; then
-  pkgver="$1"
+  pkgver="${1}"
 else
   echo "Old version: ${oldver}"
   read -p "New version: " pkgver
 fi
 # Check version
-if [ "$pkgver" = "$oldver" ]; then
+if [ "${pkgver}" = "${oldver}" ]; then
   echo >/dev/stderr "Error: same (old) version specified - update aborted"
   exit 1
 fi
@@ -17,6 +17,7 @@ fi
 # Get variables from PKGBUILD
 url=$(grep "source=" PKGBUILD | sed 's/source=("//;s/")//')
 pkgname=$(grep "_pkgname=" PKGBUILD | sed 's/_pkgname="//;s/"//')
+pkgrel=$(grep "pkgrel=" PKGBUILD | sed 's/pkgrel="//;s/"//')
 aur_url=$(grep "pkgname=" PKGBUILD | tail -n 1 | sed 's/pkgname="//;s/"//')
 # Perform variable substitution
 archive_url="${url//\$\{_pkgname\}/$pkgname}"
@@ -24,13 +25,13 @@ archive_url="${archive_url//\$\{pkgver\}/$pkgver}"
 aur_url="ssh://aur@aur.archlinux.org/${aur_url//\$\{_pkgname\}/$pkgname}.git"
 
 # Download archive
-wget -O $pkgname.tar.gz "$archive_url"
+wget -O ${pkgname}.tar.gz "${archive_url}"
 # Calculate checksums
-sha1sum=$(sha1sum $pkgname.tar.gz | awk '{print $1}')
-sha256sum=$(sha256sum $pkgname.tar.gz | awk '{print $1}')
-md5sum=$(md5sum $pkgname.tar.gz | awk '{print $1}')
+sha1sum=$(sha1sum ${pkgname}.tar.gz | awk '{print $1}')
+sha256sum=$(sha256sum ${pkgname}.tar.gz | awk '{print $1}')
+md5sum=$(md5sum ${pkgname}.tar.gz | awk '{print $1}')
 # Yoink the archive - unnecessary anymore
-rm -f $pkgname.tar.gz
+rm -f ${pkgname}.tar.gz
 
 # Update PKGBUILD with new values
 sed -i -E "s/^pkgver=\"[^\"]+\"/pkgver=\"$pkgver\"/" PKGBUILD
@@ -43,7 +44,7 @@ makepkg --printsrcinfo > .SRCINFO
 
 # In case of fire, git commit, git push, leave building
 git add .
-git commit -m "Updated $pkgname to $pkgver"
+git commit -m "Updated ${pkgname} to ${pkgver}-${pkgrel}"
 git remote add aur ${aur_url}
 git push origin main
 git push aur main:master