From ed19d6fdc6a4de2b663a95fcd399fe0d335d68d8 Mon Sep 17 00:00:00 2001
From: bones_was_here <bones_was_here@xonotic.au>
Date: Sun, 28 May 2023 17:06:32 +1000
Subject: [PATCH] Support RC tagging, simplify pipeline files rsync

---
 misc/infrastructure/xonotic-release-build.cron | 8 +++++---
 misc/tools/all/release.subr                    | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 8a16fbca..8293b3a1 100755
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -10,6 +10,10 @@ case "$RELEASETYPE" in
 		RELEASETYPEDIR=
 		RELEASETYPENAME="$RELEASETYPE"
 		;;
+	RC*)
+		RELEASETYPEDIR="$RELEASETYPE/"
+		RELEASETYPENAME="$RELEASETYPE build"
+		;;
 	*)
 		RELEASETYPEDIR="$RELEASETYPE/"
 		RELEASETYPENAME="$RELEASETYPE-like build"
@@ -95,9 +99,7 @@ if [ -z "$RELEASETYPEDIR" ]; then
 	# pipeline files, see: .gitlab-ci.yml in xonotic-data.pk3dir
 	cp data/stormkeep-????????????????????????????????????????-????????????????????????????????????????.pk3 stormkeep.pk3
 	PIPELINE_FILES="gmqcc/gmqcc Xonotic/xonotic-linux64-dedicated stormkeep.pk3"
-	for FILE in $PIPELINE_FILES; do
-		rsync -vSP "$FILE" autobuild-release-uploader@beta.xonotic.org:../pipeline-bin/
-	done
+	rsync -vSP $PIPELINE_FILES autobuild-release-uploader@beta.xonotic.org:../pipeline-bin/
 	rm -f stormkeep.pk3
 fi
 echo "Finished a new $RELEASETYPENAME at http://beta.xonotic.org/autobuild/$RELEASETYPEDIR" | $IRCSPAM
diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index be1cc7fe..161dec26 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -150,7 +150,7 @@ case "$cmd" in
 				#   (YYYYMMDD)
 				exit 1
 				;;
-			release)
+			release|RC*)
 				msg "Building a FINISHED RELEASE"
 				getversion data/xonotic-data.pk3dir
 				verbose "$SELF" each -k git tag -m "TEMP TAG" -f "xonotic-v$versionstr"
@@ -164,7 +164,7 @@ case "$cmd" in
 		if [ -n "$RELEASEDATE" ]; then
 			verbose $ECHO "$RELEASEDATE" > Xonotic/stamp.txt
 			case "$RELEASETYPE" in
-				release)
+				release|RC*)
 					verbose $ECHO "${RELEASEDATE%_*}" > Xonotic/pk3stamp.txt
 					;;
 				*)
@@ -456,6 +456,9 @@ case "$cmd" in
 			case "$RELEASETYPE" in
 				release)
 					;;
+				RC*)
+					versionstr="$versionstr $RELEASETYPE"
+					;;
 				*)
 					versionstr="$versionstr$RELEASETYPE"
 					;;
@@ -479,7 +482,7 @@ case "$cmd" in
 			fi
 			mv xonotic-common.cfg.new xonotic-common.cfg
 			case "$RELEASETYPE" in
-				release)
+				release|RC*)
 					echo "" >> xonotic-common.cfg
 					echo "// nicer menu" >> xonotic-common.cfg
 					echo "set menu_watermark \"\"" >> xonotic-common.cfg
-- 
2.39.2