From d9c20a4349361719a23178d8689b85956e9b62e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Wed, 24 Dec 2014 11:47:38 +0100
Subject: [PATCH] Fail more verbosely when early clean/config steps are failing

---
 build.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 2b659de..fc741fc 100755
--- a/build.sh
+++ b/build.sh
@@ -21,6 +21,15 @@ image_name() {
 	echo $IMAGE_TEMPLATE | sed -e "s/ARCH/$arch/"
 }
 
+failure() {
+	local logfile=$1
+
+	echo "Build of $KALI_DIST/$KALI_ARCH live image failed" >&2
+	echo "Last 50 lines of $logfile:" >&2
+	tail -n 50 $logfile >&2
+	exit 2
+}
+
 # Parsing command line options
 temp=$(getopt -o spdra: -l single,proposed-updates,kali-dev,kali-rolling,arch: -- "$@")
 eval set -- "$temp"
@@ -107,15 +116,16 @@ mkdir -p $TARGET_DIR
 
 for KALI_ARCH in $KALI_ARCHES; do
 	IMAGE_NAME="$(image_name $KALI_ARCH)"
+	set +e
 	$SUDO lb clean --purge >prepare.log 2>&1
+	[ $? -eq 0 ] || failure prepare.log
 	lb config -a $KALI_ARCH $KALI_CONFIG_OPTS >>prepare.log 2>&1
+	[ $? -eq 0 ] || failure prepare.log
 	$SUDO lb build >/dev/null
 	if [ $? -ne 0 ] || [ ! -e $IMAGE_NAME ]; then
-		echo "Build of $KALI_DIST/$KALI_ARCH live image failed" >&2
-		echo "Last 50 lines of the log:" >&2
-		tail -n 50 binary.log >&2
-		exit 1
+		failure binary.log
 	fi
+	set -e
 	IMAGE_EXT="${IMAGE_NAME##*.}"
 	IMAGE_EXT="${IMAGE_EXT:-img}"
 	mv $IMAGE_NAME $TARGET_DIR/kali-linux-$KALI_VERSION-$KALI_ARCH.$IMAGE_EXT