From ac5d1e42fb98ff8199786ca82c37cd853631877a Mon Sep 17 00:00:00 2001
From: ilewis <idlewis@users.noreply.github.com>
Date: Tue, 16 Dec 2025 13:25:57 +0000
Subject: [PATCH] Only use `set -x` when VERBOSE flag is set

---
 ga/latest/kernel/helpers/build/configure.sh               | 4 ++--
 ga/latest/kernel/helpers/build/features.sh                | 2 +-
 ga/latest/kernel/helpers/build/infinispan-client-setup.sh | 2 +-
 ga/latest/kernel/helpers/build/internal/logger.sh         | 4 +++-
 ga/latest/kernel/helpers/build/populate_scc.sh            | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ga/latest/kernel/helpers/build/configure.sh b/ga/latest/kernel/helpers/build/configure.sh
index 77f0c769..a1ed2062 100755
--- a/ga/latest/kernel/helpers/build/configure.sh
+++ b/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 "$@"
\ No newline at end of file
+main "$@"
diff --git a/ga/latest/kernel/helpers/build/features.sh b/ga/latest/kernel/helpers/build/features.sh
index a9469b85..2773c506 100755
--- a/ga/latest/kernel/helpers/build/features.sh
+++ b/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
diff --git a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
index ca8a36f4..83e43fa9 100755
--- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
+++ b/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
diff --git a/ga/latest/kernel/helpers/build/internal/logger.sh b/ga/latest/kernel/helpers/build/internal/logger.sh
index a4fd59ca..f03421ef 100755
--- a/ga/latest/kernel/helpers/build/internal/logger.sh
+++ b/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
\ No newline at end of file
+main
diff --git a/ga/latest/kernel/helpers/build/populate_scc.sh b/ga/latest/kernel/helpers/build/populate_scc.sh
index ac2b762e..0013505a 100755
--- a/ga/latest/kernel/helpers/build/populate_scc.sh
+++ b/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