Only use set -x when VERBOSE flag is set

Author: idlewis

ga/latest/kernel/helpers/build/configure.sh

@@ -22,7 +22,7 @@ fi
 
 . /opt/ibm/helpers/build/internal/logger.sh
 
-set -Eeox pipefail
+set -Eeo pipefail
 
 function main() {
   ##Define variables for XML snippets source and target paths
@@ -231,4 +231,4 @@ function parseCommaList() {
   done
 }
 
-main "$@"
+main "$@"

ga/latest/kernel/helpers/build/features.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 . /opt/ibm/helpers/build/internal/logger.sh
 
-set -Eeox pipefail
+set -Eeo pipefail
 
 ##Define variables for XML snippets source and target paths
 SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets

ga/latest/kernel/helpers/build/infinispan-client-setup.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 . /opt/ibm/helpers/build/internal/logger.sh
 
-set -Eeox pipefail
+set -Eeo pipefail
 
 pkgcmd=yum
 if ! command $pkgcmd

ga/latest/kernel/helpers/build/internal/logger.sh

@@ -16,6 +16,8 @@
 function main() {
     if [ "$VERBOSE" != "true" ]; then
         exec >/dev/null
+    else
+        set -x
     fi
 }
 
@@ -27,4 +29,4 @@ function showLogs() {
     exec 1>&3 3>&- 2>&4 4>&-
 }
 
-main
+main

ga/latest/kernel/helpers/build/populate_scc.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 . /opt/ibm/helpers/build/internal/logger.sh
 
-set -Eeox pipefail
+set -Eeo pipefail
 
 # 32-bit JVMs don't supported multi-layered SCCs.
 [ -e "$JAVA_HOME/lib/i386" -o -e "$JAVA_HOME/lib/ppc" -o -e "$JAVA_HOME/lib/s390" ] && exit 0