From f6854c01a747f20b5be032c53d376543bb9d8ef3 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 14 Sep 2020 02:16:19 +0000
Subject: [PATCH] Added support for multiple packages from single PKGBUILD

---
 README.org |   12 ++++--------
 main.sh    |   39 ++++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/README.org b/README.org
index bb0cfce..2ff33e7 100755
--- a/README.org
+++ b/README.org
@@ -24,11 +24,7 @@
 To allow automatic building, use a cronjob or write a systemd unit, there are many guides out there, although I may add examples if I feel like it.
 
 * To Dos
-- Multiple packages from a single PKGBUILD ::
-  Some PKGBUILDs can create many packages at once, currently I am unable to handle this.
-- AUR dependency checking and automatic resolution ::
-  Something like what aurutils does, maybe I can steal it from there
-- Error catching for builds which fail. ::
-  Have emailing, but nothing more advanced. Would be nice to have some basic error handling in the script
-- Create a universal variables file ::
-  Not sure how useful this would be, but could be nice
+# - Multiple packages from a single PKGBUILD :: Some PKGBUILDs can create many packages at once, currently I am unable to handle this.
+- AUR dependency checking and automatic resolution :: Something like what aurutils does, maybe I can steal it from there
+- Error catching for builds which fail. :: Have emailing, but nothing more advanced. Would be nice to have some basic error handling in the script
+- Create a universal variables file :: Not sure how useful this would be, but could be nice
diff --git a/main.sh b/main.sh
index 53a4e0b..3b3ece3 100644
--- a/main.sh
+++ b/main.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+#A basic bash script to automate the building of arch packages
+# Usage: main.sh init|add|build_all [-f force]
 
 REPODIR=/repo/x86_64
 BUILDDIR=/repo/build
@@ -15,6 +17,7 @@
 
 #Helper for finding newest and oldest files
 #Sourced from stack overflow
+# Usage: newold_matching_file [n/o] [filename]
 function newold_matching_file
 {
     # Use ${1-} instead of $1 in case 'nounset' is set
@@ -48,35 +51,45 @@
 }
 
 #Build latest version of a package
+# Usage: build_pkg [package name] [new?] [-f force]
 function build_pkg {
 	#check if PKGBUILD has updated, don't rebuild if hasn't changed
-	#rebuild if git is in filename (git tree may change without PKGBUILD)
-	#rebuild if forced
 	if [[ ! -z $(git pull | grep "Already up to date.") && -z $(echo $1 | grep git) && -z $2 ]]; then
 		return 2
 	fi
+
+	#remove old versions before build
+	rm "$1*.pkg.tar.xz"
+
+	#make and force rebuild if is git package
 	makepkg -s --noconfirm $([ $CLEAN == "Y" ] && echo "-c") $([ $SIGN == "Y" ] && echo "--sign --key $KEY") $([ "$2" == "-f" ] && echo -f)
 	if [ $? != 0 ]; then
 		#Register error
-		ERRORS=$(printf '%s %s' "$ERRORS" "$1")
+		ERRORS="$ERRORS $1"
 		return 1
 	fi
 
 	#copy package to repo directory
-	latest="$(newold_matching_file n '*.pkg.tar.xz')"
-	cp $latest $REPODIR/$latest
-	repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$latest
+	#latest="$(newold_matching_file n '*.pkg.tar.xz')"
+	for f in '$1*.pkg.tar.xz'
+	do
+		cp $f $REPODIR/$f
+		repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$f
+	done
 
 	#Remove old versions of packages
-	while [ $NUM_OLD \< $(find . -name '*.pkg.tar.xz' | wc -l) ]
-	do
-		old=$(newold_matching_file o '*.pkg.tar.xz')
-		rm $REPODIR/$old $old
-	done
+	#TODO: Want to be able to keep multiple versions of old packages, future work
+	#Currently old package versions stay in the repodir indefinately
+	# while [ $NUM_OLD \< $(find . -name '*.pkg.tar.xz' | wc -l) ]
+	# do
+	# 	old=$(newold_matching_file o '*.pkg.tar.xz')
+	# 	rm $REPODIR/$old $old
+	# done
 	return 0
 }
 
 #Update packages in BUILDDIR
+# Usage: build_all [-f force]
 function build_all {
 	#system update
 	if [ $UPDATE == "Y" ]; then
@@ -93,6 +106,8 @@
 }
 
 #Add a new package to be built
+#There is no name checking so be sure to put in the name correctly
+# Usage: add [package name]
 function add {
 	cd $BUILDDIR
 	git clone https://aur.archlinux.org/$1.git
@@ -102,6 +117,8 @@
 }
 
 #Check config and create build folders
+#Set variables before usage
+# Usage: init
 function init {
 	#check for configuration here
 	[ -z $REPODIR ] && echo "Enter REPODIR" && return 1

--
Gitblit v1.10.0