Move debug to util/debug_options.sh

prep.sh

@@ -1,10 +1,10 @@
-#!/bin/bash -x
+#!/bin/bash
+#
 # prep.sh
 #
 # Sample script to retrieve ~1 month of data
 
-set -uo pipefail
-test -n "${BCTOOL_DEBUG}" && set -x
+source ./util/debug_options.sh
 
 ./util/check_requirements.sh || exit 1
 
@@ -44,10 +44,10 @@ function updatenml(){
   done
 }
 
-./preprocessor.ESGF 2033-12-30_00:00:00 2034-01-04_00:00:00 ${BCTABLE}
+#./preprocessor.ESGF 2033-12-30_00:00:00 2034-01-04_00:00:00 ${BCTABLE}
 
 WRFDIR=${WRFDIR:-WRF}
-./util/deploy_WRF_CMake_binaries.sh ${WRFDIR}
+#./util/deploy_WRF_CMake_binaries.sh ${WRFDIR}
 
 cd $WRFDIR
 #

util/check_requirements.sh

@@ -2,8 +2,7 @@
 #
 # Check availability of command dependencies
 
-set -euo pipefail
-test -n "${BCTOOL_DEBUG}" && set -x
+source util/debug_options.sh
 
 commands="wget tar xz wget sed grep cdo ncdump ncks"
 failed=false

util/clean_WRF_dir.sh

@@ -1,9 +1,7 @@
 #!/bin/bash 
 #
 #
-
-set -euo pipefail
-test -n "${BCTOOL_DEBUG}" && set -x
+source util/debug_options.sh
 
 tag=$1
 target="WRF.${tag}"

util/debug_options.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Shell settings
+# 
+# set
+#          -e : abort execution on error
+#          -u : abort execution on undefined variable
+#          -x : show shell-expanded commands
+# -o pipefail : abort execution on error in pipe command
+set -uo pipefail
+BCTOOL_DEBUG=${BCTOOL_DEBUG:-0}
+test "${BCTOOL_DEBUG}" -ne 0 && set -x

util/deploy_WRF_CMake_binaries.sh

@@ -1,10 +1,7 @@
 #!/bin/bash 
 #
 #
-
-# Shell settings
-set -euo pipefail
-test -n "${BCTOOL_DEBUG}" && set -x
+source util/debug_options.sh
 
 WRFDIR=${1:-WRF}
 

util/link_grib.sh

@@ -1,10 +1,6 @@
 #!/bin/bash 
 #
-#
-
-set -euo pipefail
-test -n "${BCTOOL_DEBUG}" && set -x
-
+# Bash reimplementation of the standard WPS link_grib.csh
 if test -z "$1"; then
    echo " " 
    echo " "