diff --git a/workflow/qhtcp-workflow b/workflow/qhtcp-workflow index 87160196..62dc027d 100755 --- a/workflow/qhtcp-workflow +++ b/workflow/qhtcp-workflow @@ -1411,7 +1411,7 @@ submodule get_easy_results # lol # @exitcode 1 if no results directories exist # @set EASY_RESULTS_DIRS array Globbed results files from PROJECT_SCANS_DIR/ # @set EASY_RESULTS_FILES array Globbed results files from PROJECT_SCANS_DIR/ -# @arg $1 string Project scans (ExpJobs) +# @arg $1 string Project scans get_easy_results() { debug "Running: ${FUNCNAME[0]}" @@ -1472,10 +1472,9 @@ main() { TEMPLATES_DIR="$SCRIPT_DIR/templates" APPS_DIR="$SCRIPT_DIR/apps" DATE="$(date +%Y%m%d)" # change in EASYConsole.m to match - SCANS="${SCANS:-"./scans":-"/mnt/data/ExpJobs"}" - SCANS_HEIRARCHY=("./scans" "/mnt/data/scans" "/mnt/data/ExpJobs") # search for an existing scans dir in this order + SCANS_HEIRARCHY=("./scans" "/mnt/data/scans" "/mnt/data/ExpJobs" "./scans") # search for a scans dir in this order (and fall back to default) # Find a scans directory - for d in "${SCANS_HEIRARCHY[@]}"; do + [[ -z $SCANS_DIR ]] && for d in "${SCANS_HEIRARCHY[@]}"; do if [[ -d $d ]]; then SCANS_DIR="$d" fi