verbosity fixes

9 years ago · d16fac0b56
parent 0b8d27c1fb
commit d16fac0b56
2 changed files with 9 additions and 5 deletions
--- a/10
+++ b/10
@ -1,5 +1,9 @@
 #!/bin/bash

+if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
+    set -x
+fi
+
 # ------------------------------------------------------------------------------
 # Configurations
 # ------------------------------------------------------------------------------
@ -10,11 +14,7 @@ RETCODE=0

 : ${DIST=fc14}

-if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
-    set -x
-else
-    set -e
-fi
+set -e

 . ./builder_setup >/dev/null
 . ./umount_kill.sh >/dev/null
--- a/umount_kill.sh
+++ b/umount_kill.sh
@ -24,6 +24,10 @@
 # ./umount_kill.sh chroot-jessie
 #

+if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
+    set -x
+fi
+
 . ./functions.sh

 mountPoint() {