From 08ec32cf62fb83a2d051c64e8934534a67506a0f Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 22 Aug 2017 09:57:53 -0300
Subject: Teach build_snapshots.sh to read exit code of build.sh

---
 tools/build_snapshots.sh | 51 ++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

(limited to 'tools')

diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh
index 2f546bc..78f6b84 100755
--- a/tools/build_snapshots.sh
+++ b/tools/build_snapshots.sh
@@ -80,6 +80,23 @@ snapshot_update_status() {
 		--snapshot-update-status "$*"
 }
 
+exec_and_update_status() {
+	local _cmd="${@}"
+
+	[ -z "${_cmd}" ] \
+		&& return 1
+
+	# Ref. https://stackoverflow.com/a/30658405
+	exec 4>&1
+	local _result=$( \
+	    { { ${_cmd} 2>&1 3>&-; printf $? 1>&3; } 4>&- \
+	    | while read -r LINE; do \
+	    snapshot_update_status "${LINE}"; done 1>&4; } 3>&1)
+	exec 4>&-
+
+	return ${_result}
+}
+
 git_last_commit() {
 	[ -z "${NO_RESET}" ] \
 		&& git -C "${BUILDER_ROOT}" reset --hard >/dev/null 2>&1
@@ -166,26 +183,22 @@ while [ /bin/true ]; do
 	IFS="
 "
 	if [ -n "${POUDRIERE_SNAPSHOTS}" ]; then
-		(${BUILDER_ROOT}/build.sh --update-poudriere-ports 2>&1) \
-		    | while read -r LINE; do
-			snapshot_update_status "${LINE}"
-		done
-
-		(${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --update-pkg-repo 2>&1) \
-		    | while read -r LINE; do
-			snapshot_update_status "${LINE}"
-		done
+		exec_and_update_status \
+		    "${BUILDER_ROOT}/build.sh --update-poudriere-ports" \
+		    || exit $?
+
+		exec_and_update_status \
+		    "${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --update-pkg-repo" \
+		    || exit $?
 	else
-		(${BUILDER_ROOT}/build.sh --clean-builder 2>&1) \
-		    | while read -r LINE; do
-			snapshot_update_status "${LINE}"
-		done
-
-		(${BUILDER_ROOT}/build.sh ${NO_UPLOAD} \
-		    --snapshots ${NO_IMAGES} "memstick memstickadi memstickserial iso" 2>&1) \
-		    | while read -r LINE; do
-			snapshot_update_status "${LINE}"
-		done
+		exec_and_update_status \
+		    "${BUILDER_ROOT}/build.sh --clean-builder" \
+		    || exit $?
+
+		exec_and_update_status \
+		    "${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --snapshots " \
+		    "${NO_IMAGES} 'memstick memstickadi memstickserial iso'" \
+		    || exit $?
 	fi
 	IFS=${OIFS}
 
-- 
cgit v1.1