From 4b2ce1841d360cfd41042f66e382d3c8ff6bf462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Wed, 29 Nov 2017 13:53:03 +0000
Subject: build.sh: always print std{out,err} logs given ${ARG_XTRACE} (-x.)
 etc/build.usage: updated. subr/ex_pkg_dispatch.subr: set -o xtrace within
 child process given ${ARG_XTRACE} (-x.) subr/ex_setup_args.subr: set
 ${ARG_VERBOSE2} (-vv) given ${ARG_XTRACE} (-x.)

---
 build.sh                  | 4 ++++
 etc/build.usage           | 2 +-
 subr/ex_pkg_dispatch.subr | 3 +++
 subr/ex_setup_args.subr   | 6 ++----
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 8c0d4b02..4c3d9ff6 100755
--- a/build.sh
+++ b/build.sh
@@ -25,6 +25,10 @@ for BUILD_TARGET_META in invariants ${BUILD_TARGETS_META:-world}; do
 			0) : $((BUILD_NFINI+=1));
 			   if [ "${ARG_VERBOSE2:-0}" -eq 1 ]; then
 				cat "${WORKDIR}/${PKG_NAME}_stdout.log";
+				if [ "${ARG_XTRACE:-0}" -eq 1 ]; then
+					ex_log_msg vvfo "${WORKDIR}/${PKG_NAME}_stderr.log:";
+					cat "${WORKDIR}/${PKG_NAME}_stderr.log";
+				fi;
 			   fi;
 			   ex_log_msg succ "Finished \`${PKG_NAME}' build."; ;;
 			*) : $((BUILD_NFAIL+=1));
diff --git a/etc/build.usage b/etc/build.usage
index 79342206..d5fe1aa7 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -1,7 +1,7 @@
 usage: ./build.sh [-x] [-4|6] [-a nt32|nt64] [-b debug|release] [-c] [-h]
                   [-i] [-N] [-r package[,...][:step]] [-R] [-t[.gz|.bz2|.xz] [-v[v[v]]]
                   [<target>[ ...]]
-        -x                      Set the xtrace sh(1)ell option for debugging purposes.
+        -x                      Set xtrace during package builds; implies -vv.
         -4|-6                   Force IPv[46] when downloading files.
         -a nt32|nt64            Selects 32-bit or 64-bit architecture; defaults to nt64.
         -b debug|release        Selects debug or release build; defaults to debug.
diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr
index a58818ba..f099dd6a 100644
--- a/subr/ex_pkg_dispatch.subr
+++ b/subr/ex_pkg_dispatch.subr
@@ -24,6 +24,9 @@ ex_pkg_dispatch() {
 	      else						\
 		echo \"fail ${PKG_NAME}\" >&3;			\
 	      fi;" EXIT HUP INT TERM USR1 USR2;
+	if [ "${ARG_XTRACE:-0}" -eq 1 ]; then
+		set -o xtrace;
+	fi;
 	ex_pkg_vars;
 	if [ "${PKG_DISABLED:-0}" -eq 1 ]; then
 		ex_log_msg vnfo "Skipping disabled package \`${PKG_NAME}.'";
diff --git a/subr/ex_setup_args.subr b/subr/ex_setup_args.subr
index fed20d69..2f00c6dc 100644
--- a/subr/ex_setup_args.subr
+++ b/subr/ex_setup_args.subr
@@ -50,10 +50,8 @@ ex_setup_args() {
 			TARBALL_SUFFIX=xz;
 		fi;
 	fi;
-	if [ "${ARG_XTRACE:-0}" -eq 1 ]; then
-		set -o xtrace;
-	fi;
-	if [ "${ARG_VERBOSE3:-0}" -eq 1 ]; then
+	if [ "${ARG_VERBOSE3:-0}" -eq 1 ]\
+	|| [ "${ARG_XTRACE:-0}" -eq 1 ]; then
 		ARG_VERBOSE2=1;
 	fi;
 	if [ "${ARG_VERBOSE2:-0}" -eq 1 ]; then
-- 
cgit v1.2.3