[gentoo-commits] proj/releng:master commit in: tools/

[Ben Kohler]

commit:     a831d3f1499adc4eb04e113fe6a2bf5eef6bd79f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 17:02:26 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 17:02:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=a831d3f1

catalyst-auto-sparc64.conf: redo post_build modeled after ppc

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 tools/catalyst-auto-sparc64.conf | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 570a0566..3a3e5f0e 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -46,22 +46,28 @@ update_symlinks() {
   done
 }
 
+upload() {
+	rsync 	-e 'ssh -i /root/.ssh/id_rsa'
+		-a 
+		--omit-dir-times
+		--delay-updates
+		"$@"
+		sparc@×××××××××××××××××.org:
+}
 
 post_build() {
-  # We only want to do anything on the final (0 argument) post_build call
-  [ $# -eq 0 ] || return 0
-
-  mkdir -p ${TMPDIR}/empty
-  cmd=(
-    rsync
-    -e 'ssh -i /root/.ssh/id_rsa'
-    -a
-    --omit-dir-times
-    --delay-updates
-  )
-  "${cmd[@]}" ${TMPDIR}/empty ${DEST}
-  "${cmd[@]}" \
-    ${BUILD_SRCDIR_BASE}/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \
-    ${BUILD_SRCDIR_BASE}/default/*${DATESTAMP}*.iso* \
-    sparc@×××××××××××××××××.org:
+	local set=$1 spec=$2
+
+	pushd "${BUILD_SRCDIR_BASE}/default/" > /dev/null
+
+	case ${spec} in
+	stage3.spec
+		upload stage3-*${DATESTAMP}*${EXTENSIONS}*
+		;;
+	installcd-stage2-minimal.spec
+		upload *${DATESTAMP}*.iso*
+		;;
+	esac
+
+	popd > /dev/null
 }