From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 20 Mar 2021 21:49:36 +0000 (+0100)
Subject: - cosmetics and cleanup
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=7b38371253db760e5cd2d518b717b326a8aaf81a;p=tld-builder.git

- cosmetics and cleanup
---

diff --git a/client/make-request.sh b/client/make-request.sh
index 271a777..aebc5dd 100755
--- a/client/make-request.sh
+++ b/client/make-request.sh
@@ -17,7 +17,7 @@ dist=
 url=
 no_depend=no
 verbose=no
-autotag=no
+pkgrevision=no
 requester_override=
 relup=no
 
@@ -177,26 +177,9 @@ df_fetch() {
 	done
 }
 
-# autotag from rpm-build-macros
-# displays latest used tag for a specfile
-autotag() {
-	local out s
-	for s in "$@"; do
-		# strip branches
-		s=${s%:*}
-		# ensure package ends with .spec
-		s=${s%.spec}.spec
-		git fetch --tags
-		out=$(git for-each-ref --count=1 --sort=-authordate refs/tags/auto/$dist \
-			--format='%(refname:short)')
-		echo "$s:$out"
-	done
-}
-
-# get autotag for specs
-# WARNING: This may checkout some files from VCS
-get_autotag() {
-	local atag pkg spec rpmdir
+# get package revision for specs
+get_pkgrevision() {
+	local pkgrev pkg spec rpmdir
 
 	rpmdir=$(rpm -E %_topdir)
 	for pkg in "$@"; do
@@ -206,12 +189,12 @@ get_autotag() {
 		# strip .spec extension
 		pkg=${pkg%.spec}
 		wget http://pkgrevs.tld-linux.org/list/$pkg -O /tmp/$pkg.tags 1>/dev/null 2>&1
-		atag=$(head -n 1 /tmp/$pkg.tags)
+		pkgrev=$(head -n 1 /tmp/$pkg.tags)
 		rm -f /tmp/$pkg.tags
-		if [ "x$atag" = "x" ]; then
+		if [ "x$pkgrev" = "x" ]; then
 			echo "$pkg.spec"
 		else
-			echo "$pkg.spec:$atag"
+			echo "$pkg.spec:$pkgrev"
 		fi
 	done
 }
@@ -345,7 +328,7 @@ while [ $# -gt 0 ]; do
 			;;
 
 		-a)
-			autotag=yes
+			pkgrevision=yes
 			;;
 
 		-m)
@@ -636,9 +619,9 @@ if [ "$relup" = "yes" ]; then
 	relup ${message:+-m "$message"} $specs
 fi
 
-if [ "$autotag" = "yes" ]; then
-	msg "Auto autotag build enabled"
-	specs=$(get_autotag $specs)
+if [ "$pkgrevision" = "yes" ]; then
+	msg "Package revision build enabled"
+	specs=$(get_pkgrevision $specs)
 fi
 
 if [ "$df_fetch" = "yes" ]; then