~ salmonella-environment-setup (master) 6e7a927a0a7368429269ef7f01f1e62f61321036

commit 6e7a927a0a7368429269ef7f01f1e62f61321036
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Thu Apr 15 22:44:55 2021 +0200
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Thu Apr 15 22:44:55 2021 +0200

    run-salmonella.sh: small refactor

diff --git a/run-salmonella.sh b/run-salmonella.sh
index 78da0a5..72c2125 100755
--- a/run-salmonella.sh
+++ b/run-salmonella.sh
@@ -62,14 +62,14 @@ done
 run_hooks() {
     # Call hooks scripts, passing $OS, $ARCH, CHICKEN_4_PREFIX and
     # CHICKEN_5_PREFIX as arguments
-    local log
+    local hooks_logfile
     local hook
     local hook_dir
 
-    log=${LOG_DIR}/hooks.log
+    hooks_logfile=${LOG_DIR}/hooks.log
 
     mkdir -p "$LOG_DIR"
-    rm -f "$log"
+    rm -f "$hooks_logfile"
 
     for hook_dir in "${HOOKS_DIR}/common" "${HOOKS_DIR}/${OS}" "${HOOKS_DIR}/${OS}/${ARCH}"
     do
@@ -77,7 +77,7 @@ run_hooks() {
             for hook in "${hook_dir}/"*; do
                 if [ -x "$hook" ]; then
                     echo "=== Running hook $hook ==="
-                    "$hook" "$OS" "$ARCH" "$CHICKEN_4_PREFIX" "$CHICKEN_5_PREFIX" > "$log" 2>&1
+                    "$hook" "$OS" "$ARCH" "$CHICKEN_4_PREFIX" "$CHICKEN_5_PREFIX" > "$hooks_logfile" 2>&1
                 fi
             done
         fi
@@ -97,14 +97,15 @@ main() {
     done
 
     mkdir -p "$LOG_DIR" "$WORK_DIR"
-    logfile="$LOG_DIR/watchdog.log"
+    local watchdog_logfile
+    watchdog_logfile="$LOG_DIR/watchdog.log"
 
     # Run salmonella from $WORK_DIR
     cd "$WORK_DIR"
 
     ### Prevent two salmonellas from running simultaneously
     while ps ax | grep '[s]almonella-run-publish'; do
-        echo "[`date`] Salmonella still running" >> $logfile
+        echo "[`date`] Salmonella still running" >> "$watchdog_logfile"
         # OpenBSD's sleep doesn't suffixes like `h' (hours) or `m' (minutes)
         sleep 3600
     done
@@ -112,6 +113,9 @@ main() {
     # Remove leftovers from previous executions
     rm -rf salmonella-run-publish
 
+    local salmonella_run_publish
+    salmonella_run_publish="$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish"
+
     for conf in $confs; do
         # The inline egg writes some stuff to the home dir
         rm -rf ~/.chicken-inline
@@ -126,10 +130,10 @@ main() {
         if [ -e "$local_conf_path" ]; then
             echo "Loading $conf_path"
             echo "Loading $local_conf_path"
-            "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path" "$local_conf_path"
+            "$salmonella_run_publish" "$conf_path" "$local_conf_path"
         else
             echo "Loading $conf_path"
-            "$CHICKEN_TESTS_PREFIX/bin/salmonella-run-publish" "$conf_path"
+            "$salmonella_run_publish" "$conf_path"
         fi
         [ -d salmonella-run-publish ] && mv salmonella-run-publish "salmonella-$conf"
     done