From 75cf533cc5d4f85834668baf23956e46424e986a Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>
Date: Feb 06 2017 15:30:38 +0000
Subject: build.sh: call post_sha256sums() before calling post_tarballs().

subr/post_sha256sums.subr: compute SHA256SUMs only if !${BUILD_SCRIPT_RC} && ${ARG_TARBALL}.
subr/post_tarballs.subr: cleanup; include SHA256SUMS in dist tarball.

---

diff --git a/build.sh b/build.sh
index 1bd3768..1ef98bd 100755
--- a/build.sh
+++ b/build.sh
@@ -115,7 +115,7 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do
 	fi;
 done;
 if [ "${BUILD_SCRIPT_RC:-0}" -eq 0 ]; then
-	post_copy_etc; post_strip; post_tarballs; post_sha256sums;
+	post_copy_etc; post_strip; post_sha256sums; post_tarballs;
 fi;
 post_build_files;
 log_msg info "${BUILD_NFINI} finished, ${BUILD_NSKIP} skipped, and ${BUILD_NFAIL} failed builds in ${BUILD_NBUILT} build script(s).";
diff --git a/subr/post_sha256sums.subr b/subr/post_sha256sums.subr
index ee00285..c5f736e 100644
--- a/subr/post_sha256sums.subr
+++ b/subr/post_sha256sums.subr
@@ -4,13 +4,16 @@
 
 post_sha256sums() {
 	local __;
-	log_msg info "Compiling SHA256 sums...";
-	if [ -e "${PREFIX}/SHA256SUMS" ]; then
-		build_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last";
+	if [ "${BUILD_SCRIPT_RC:-0}" -eq 0 ]\
+	&& [ "${ARG_TARBALL:-0}" -eq 1 ]; then
+		log_msg info "Compiling SHA256 sums...";
+		if [ -e "${PREFIX}/SHA256SUMS" ]; then
+			build_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last";
+		fi;
+		for __ in $(find "${PREFIX_NATIVE}" -type f -perm /a=x -name bin/\* -name lib/\*); do
+			sha256sum "${__}";
+		done > "${PREFIX}/SHA256SUMS";
 	fi;
-	for __ in $(find "${PREFIX_NATIVE}" -type f -perm /a=x -name bin/\* -name lib/\*); do
-		sha256sum "${__}";
-	done > "${PREFIX}/SHA256SUMS";
 };
 
 # vim:filetype=sh
diff --git a/subr/post_tarballs.subr b/subr/post_tarballs.subr
index 245d3a6..6bfcb3a 100644
--- a/subr/post_tarballs.subr
+++ b/subr/post_tarballs.subr
@@ -3,73 +3,73 @@
 #
 
 postp_tarball_dist() {
-	TARBALL_FNAME=${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX};	
+	TARBALL_FNAME="${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
 	tar -cpf - $(find . -maxdepth 2 -mindepth 1 -type d				\
 			-not -path ./${PREFIX_BASENAME} 				\
 			-not -path ./${PREFIX_BASENAME}.bak				\
 			-not -path ./${PREFIX_BASENAME}.bak/\*				\
 			-not -path ./tmp -not -path ./tmp/\*)				\
-		midipix_shortcut.vbs midipix.sh	README					|\
-	${TARBALL_COMPRESS_CMD} ${TARBALL_COMPRESS_ARGS} -c > ${TARBALL_FNAME};
+		midipix_shortcut.vbs midipix.sh	README SHA256SUMS			|\
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_FNAME}";
 	log_msg info "Finished building binary distribution tarball.";
-	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&\
+	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&		\
 				gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
 		gpg --armor --passphrase-file /dev/null					\
-			--local-user "${TARBALL_SIGN_GPG_KEY}" --sign ${TARBALL_FNAME};
+			--local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_FNAME}";
 		log_msg info "Signed binary distribution tarball.";
 	fi;
 };
 
 postp_tarball_toolchain() {
-	TARBALL_CROSS_FNAME=${TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX};	
-	tar -cpf - bin include lib lib64 libexec share ${PKG_TARGET}			|\
-	${TARBALL_COMPRESS_CMD} ${TARBALL_COMPRESS_ARGS} -c > ${TARBALL_CROSS_FNAME};
+	TARBALL_CROSS_FNAME="${TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
+	tar -cpf - bin include lib lib64 libexec share "${PKG_TARGET}"			|\
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_CROSS_FNAME}";
 	log_msg info "Finished building toolchain tarball.";
 	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_CROSS_SIGN_GPG_KEY}" ] &&\
 				gpg --list-keys "${TARBALL_CROSS_SIGN_GPG_KEY}" >/dev/null 2>&1; then
 		gpg --armor --passphrase-file /dev/null					\
-			--local-user "${TARBALL_CROSS_SIGN_GPG_KEY}" --sign ${TARBALL_CROSS_FNAME};
+			--local-user "${TARBALL_CROSS_SIGN_GPG_KEY}" --sign "${TARBALL_CROSS_FNAME}";
 		log_msg info "Signed toolchain tarball.";
 	fi;
 };
 
 postp_tarball_minipix() {
-	TARBALL_MINIPIX_FNAME=${TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX};	
+	TARBALL_MINIPIX_FNAME="${TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
 	tar -cpf - minipix 								\
 		midipix_shortcut.vbs midipix.sh README					|\
-	${TARBALL_COMPRESS_CMD} ${TARBALL_COMPRESS_ARGS} -c > ${TARBALL_MINIPIX_FNAME};
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_MINIPIX_FNAME}";
 	log_msg info "Finished building binary Minipix distribution tarball.";
 	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_MINIPIX_SIGN_GPG_KEY}" ] &&\
 				gpg --list-keys "${TARBALL_MINIPIX_SIGN_GPG_KEY}" >/dev/null 2>&1; then
 		gpg --armor --passphrase-file /dev/null					\
-			--local-user "${TARBALL_MINIPIX_SIGN_GPG_KEY}" --sign ${TARBALL_MINIPIX_FNAME};
+			--local-user "${TARBALL_MINIPIX_SIGN_GPG_KEY}" --sign "${TARBALL_MINIPIX_FNAME}";
 		log_msg info "Signed binary Minipix distribution tarball.";
 	fi;
 };
 
 postp_tarball_src() {
-	TARBALL_SRC_FNAME=${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX};
+	TARBALL_SRC_FNAME="${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
 	log_msg info "Building source tarball...";
 	tar -cpf - $(find tmp -mindepth 2 -maxdepth 2				\
 		-not -path tmp/.\*						\
 		-not -path tmp/ntctty/.git					\
 		-not -path tmp/psxscl/.git					\
 		-not -path tmp/ptycon/.git)					|\
-	${TARBALL_COMPRESS_CMD} ${TARBALL_COMPRESS_ARGS} -c > ${TARBALL_SRC_FNAME};
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_SRC_FNAME}";
 	log_msg info "Finished building source tarball.";
 	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SRC_SIGN_GPG_KEY}" ] &&\
 				gpg --list-keys "${TARBALL_SRC_SIGN_GPG_KEY}" >/dev/null 2>&1; then
 		gpg --armor --passphrase-file /dev/null				\
-			--local-user "${TARBALL_SRC_SIGN_GPG_KEY}" --sign ${TARBALL_SRC_FNAME};
+			--local-user "${TARBALL_SRC_SIGN_GPG_KEY}" --sign "${TARBALL_SRC_FNAME}";
 		log_msg info "Signed source tarball.";
 	fi;
 };
 
 post_tarballs() {
-	if [ ${BUILD_SCRIPT_RC:-0} -eq 0 ]\
-	&& [ ${ARG_TARBALL:-0} -eq 1 ]; then
+	if [ "${BUILD_SCRIPT_RC:-0}" -eq 0 ]\
+	&& [ "${ARG_TARBALL:-0}" -eq 1 ]; then
 		log_msg info "Building distribution tarballs...";
-		case ${TARBALL_SUFFIX} in
+		case "${TARBALL_SUFFIX}" in
 		bz2)	if [ -n "$(which pbzip2 2>/dev/null)" ]; then
 				TARBALL_COMPRESS_CMD="pbzip2";
 			else
@@ -84,7 +84,7 @@ post_tarballs() {
 			TARBALL_COMPRESS_ARGS="-T0"; ;;
 		*)	log_msg failexit "Unknown tarball suffix \`.${TARBALL_SUFFIX}'.";
 		esac;
-		build_fileop cd ${PREFIX}; PREFIX_BASENAME=${PREFIX_NATIVE##*/};
+		build_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}";
 		postp_tarball_dist; postp_tarball_toolchain; postp_tarball_minipix;
 		if [ "${BUILD}" = "debug" ]; then
 			postp_tarball_src;