~ salmonella-environment-setup (master) c5e2ce49ebee96ef303dd904e55645ec8859b02f
commit c5e2ce49ebee96ef303dd904e55645ec8859b02f
Author: Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Fri Jun 16 23:49:18 2023 +0200
Commit: Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Fri Jun 16 23:49:18 2023 +0200
run-salmonella.sh: Rename RUN_SALMONELLA_TMP_DIR to RUN_SALMONELLA_WORK_DIR
diff --git a/run-salmonella.sh b/run-salmonella.sh
index 5955094..a7b1ace 100755
--- a/run-salmonella.sh
+++ b/run-salmonella.sh
@@ -54,15 +54,15 @@ export SALMONELLA_REPORTS_DIR=$HOME/salmonella/reports
# This must be in sync with the value of `(tmp-dir)' in
# salmonella-run-publish-params.
-RUN_SALMONELLA_TMP_DIR=salmonella-run-publish
+RUN_SALMONELLA_WORK_DIR=salmonella-run-publish
export RUN_SALMONELLA_LOG_FILE=run-salmonella.log
# salmonella-run-publish changes to `(tmp-dir)' (mapped to
-# $RUN_SALMONELLA_TMP_DIR in this script) in runtime and by default
+# $RUN_SALMONELLA_WORK_DIR in this script) in runtime and by default
# assumes the log file is there. When logging from this script,
# though, the log file is relative to $WORK_DIR (we change to
# $WORK_DIR in `main').
-log_file=$RUN_SALMONELLA_TMP_DIR/$RUN_SALMONELLA_LOG_FILE
+log_file=$RUN_SALMONELLA_WORK_DIR/$RUN_SALMONELLA_LOG_FILE
# `info' is supposed to be used after changing to $WORK_DIR.
info() {
@@ -125,10 +125,10 @@ run_salmonella() {
for conf in $confs; do
# Remove leftovers from previous executions. Once
- # `$RUN_SALMONELLA_TMP_DIR` is created it is safe to use
+ # `$RUN_SALMONELLA_WORK_DIR` is created it is safe to use
# `info'.
- rm -rf "$RUN_SALMONELLA_TMP_DIR"
- mkdir -p "$RUN_SALMONELLA_TMP_DIR"
+ rm -rf "$RUN_SALMONELLA_WORK_DIR"
+ mkdir -p "$RUN_SALMONELLA_WORK_DIR"
# Load settings files
local settings_file
@@ -160,8 +160,8 @@ run_salmonella() {
info "Running $salmonella_run_publish $args"
"$salmonella_run_publish" $args >>"$log_file" 2>&1
- [ -d "$RUN_SALMONELLA_TMP_DIR" ] &&
- mv "$RUN_SALMONELLA_TMP_DIR" "salmonella-$conf"
+ [ -d "$RUN_SALMONELLA_WORK_DIR" ] &&
+ mv "$RUN_SALMONELLA_WORK_DIR" "salmonella-$conf"
done
}
Trap