From 7a1d9d0aba2fa9d7b4e246e5f5679cb51380f6f1 Mon Sep 17 00:00:00 2001 From: Greg Cymbalski Date: Mon, 15 Dec 2025 18:40:18 -0800 Subject: [PATCH] Consistency: set -x when VERBOSE set to 1 --- build-all.sh | 4 ++++ build-container.sh | 4 ++++ build-minor.sh | 5 ++++- build-packages.sh | 8 +++++--- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/build-all.sh b/build-all.sh index b693d42a..2c12c935 100755 --- a/build-all.sh +++ b/build-all.sh @@ -1,5 +1,9 @@ #!/bin/bash +export VERBOSE="${VERBOSE:-0}" +if [ "${VERBOSE}" -eq 1 ]; then + set -x +fi export EL_VER export IS_EDGE diff --git a/build-container.sh b/build-container.sh index 02de9515..7b44183b 100755 --- a/build-container.sh +++ b/build-container.sh @@ -2,6 +2,10 @@ set -ex +export VERBOSE="${VERBOSE:-0}" +if [ "${VERBOSE}" -eq 1 ]; then + set -x +fi export EL_MAJOR_VER="${EL_MAJOR_VER:-9.5}" export EL_VER="${EL_VER:-${EL_MAJOR_VER}}" export MAJOR_VER="${EL_VER%%.*}" diff --git a/build-minor.sh b/build-minor.sh index 906326dd..60a18ade 100755 --- a/build-minor.sh +++ b/build-minor.sh @@ -1,13 +1,16 @@ #!/bin/bash set -e +export VERBOSE="${VERBOSE:-0}" +if [ "${VERBOSE}" -eq 1 ]; then + set -x +fi export EL_MAJOR_VER="${EL_MAJOR_VER:-9.4}" export EL_VER="${EL_VER:-${EL_MAJOR_VER}}" export MAJOR_VER="${EL_VER%%.*}" export MINOR_VER="${EL_VER#*.}" export RELEASE="${RELEASE:-0}" export IS_EDGE="${IS_EDGE:-0}" -export VERBOSE="${VERBOSE:-1}" export FORCE_REBUILD_DOCKER_IMAGE="${FORCE_REBUILD_DOCKER_IMAGE:-0}" export HTTP_PROXY="${HTTP_PROXY:-}" diff --git a/build-packages.sh b/build-packages.sh index b7d493ec..7a36a57c 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -1,13 +1,15 @@ #!/bin/bash set -e +export VERBOSE="${VERBOSE:-0}" +if [ "${VERBOSE}" -eq 1 ]; then + set -x +fi export EL_MAJOR_VER="${EL_MAJOR_VER:-9.5}" export EL_VER="${EL_VER:-${EL_MAJOR_VER}}" export MAJOR_VER="${EL_VER%%.*}" export MINOR_VER="${EL_VER#*.}" - -IS_EDGE="${IS_EDGE:-0}" -VERBOSE="${VERBOSE:-1}" +export IS_EDGE="${IS_EDGE:-0}" mock_args=()