Prepare for unbound variable check in workflow scripts

Author: martenole

DATA/common/gen_topo_helper_functions.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # used to avoid sourcing this file 2x
-if [[ -z $SOURCE_GUARD_FUNCTIONS ]]; then
+if [[ -z ${SOURCE_GUARD_FUNCTIONS:-} ]]; then
 SOURCE_GUARD_FUNCTIONS=1
 
 has_detector()
@@ -81,7 +81,7 @@ _check_multiple()
   CHECKER=$1
   shift
   while true; do
-    if [[ "0$1" == "0" ]]; then return 0; fi
+    if [[ -z ${1:-} ]]; then return 0; fi
     if ! $CHECKER $1; then return 1; fi
     shift
   done
@@ -133,7 +133,7 @@ add_comma_separated()
   fi
 
   for ((i = 2; i <= $#; i++ )); do
-    if [[ -z ${!1} ]]; then
+    if [[ -z ${!1:-} ]]; then
       eval $1+="${!i}"
     else
       eval $1+=",${!i}"
@@ -152,7 +152,7 @@ add_semicolon_separated()
   fi
 
   for ((i = 2; i <= $#; i++ )); do
-    if [[ -z ${!1} ]]; then
+    if [[ -z ${!1:-} ]]; then
       eval $1+="${!i}"
     else
       eval $1+="\;${!i}"

DATA/common/getCommonArgs.sh

@@ -1,26 +1,26 @@
 #!/bin/bash
 
 # used to avoid sourcing this file 2x
-if [[ -z $SOURCE_GUARD_GETCOMMONARGS ]]; then
+if [[ -z ${SOURCE_GUARD_GETCOMMONARGS:-} ]]; then
 SOURCE_GUARD_GETCOMMONARGS=1
 
 if [[ -z $SEVERITY || -z $NUMAID || -z $SHMSIZE || -z $FILEWORKDIR || -z $EPNSYNCMODE || -z $INFOLOGGER_SEVERITY || -z $SHMTHROW || -z $NORATELOG ]]; then
   echo "Configuration Environment Variable Missing in getCommonArgs.sh" 1>&2
   exit 1
 fi
 
-ARGS_ALL="--session ${OVERRIDE_SESSION:-default} --severity $SEVERITY --shm-segment-id $(($NUMAID + 10 * ${O2JOBID:-0})) --shm-segment-size $SHMSIZE $ARGS_ALL_EXTRA --early-forward-policy noraw"
-ARGS_ALL_CONFIG="NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirGRP=$FILEWORKDIRRUN;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null;$ALL_EXTRA_CONFIG"
+ARGS_ALL="--session ${OVERRIDE_SESSION:-default} --severity $SEVERITY --shm-segment-id $(($NUMAID + 10 * ${O2JOBID:-0})) --shm-segment-size $SHMSIZE ${ARGS_ALL_EXTRA:-} --early-forward-policy noraw"
+ARGS_ALL_CONFIG="NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirGRP=$FILEWORKDIRRUN;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null;${ALL_EXTRA_CONFIG:-}"
 if [[ $EPNSYNCMODE == 1 ]]; then
   ARGS_ALL+=" --infologger-severity $INFOLOGGER_SEVERITY"
   ARGS_ALL+=" --monitoring-backend influxdb-unix:///tmp/telegraf.sock --resources-monitoring 15"
   ARGS_ALL_CONFIG+="NameConf.mCCDBServer=$GEN_TOPO_EPN_CCDB_SERVER;"
   export DPL_CONDITION_BACKEND=$GEN_TOPO_EPN_CCDB_SERVER
-elif [[ "0$ENABLE_METRICS" != "01" ]]; then
+elif [[ "${ENABLE_METRICS:-}" != "1" ]]; then
   ARGS_ALL+=" --monitoring-backend no-op://"
 fi
 [[ $SHMTHROW == 0 ]] && ARGS_ALL+=" --bad-alloc-max-attempts 60 --bad-alloc-attempt-interval 1000"
-[[ ! -z $SHM_MANAGER_SHMID && "0$GEN_TOPO_CALIB_WORKFLOW" != "01" ]] && ARGS_ALL+=" --no-cleanup --shm-no-cleanup on --shmid $SHM_MANAGER_SHMID"
+[[ ! -z ${SHM_MANAGER_SHMID:-} && "0$GEN_TOPO_CALIB_WORKFLOW" != "01" ]] && ARGS_ALL+=" --no-cleanup --shm-no-cleanup on --shmid $SHM_MANAGER_SHMID"
 [[ $NORATELOG == 1 ]] && ARGS_ALL+=" --fairmq-rate-logging 0"
 
 fi # getCommonArgs.sh sourced