diff --git a/workflow/qhtcp-workflow b/workflow/qhtcp-workflow index 49e4bc57..8eb6edac 100755 --- a/workflow/qhtcp-workflow +++ b/workflow/qhtcp-workflow @@ -1292,10 +1292,10 @@ qhtcp() { (( next_study_num++ )) done - # Use initials from project not whoami + # Use initials from project or whoami? # Best I can do is first two letters of username # See TODO in markdown - initials="${PROJECT_USER:0:2}" + initials="${USER:0:2}" INITIALS=${initials^^} next_study_entry="$next_study_num,$PROJECT_SUFFIX,NA,NA,$INITIALS" debug "$next_study_entry" @@ -2061,7 +2061,7 @@ main() { SCRIPT_DIR=$(dirname "$SCRIPT") APPS_DIR="$SCRIPT_DIR/apps" TEMPLATES_DIR="$SCRIPT_DIR/templates" - PROJECT_USER="$(whoami)" + USER="$(whoami)" DATE="$(date +%Y%m%d)" # change in EASYconsole.m to match 'hardcode' # Find a scans directory @@ -2118,7 +2118,7 @@ main() { OUT_DIR=$(realpath -s "$OUT_DIR") # Set the automatic project directory prefix - PROJECT_PREFIX="${DATE}_${PROJECT_USER}" # reversed these so easier to sort and parse date + PROJECT_PREFIX="${DATE}_${USER}" # reversed these so easier to sort and parse date sanitize_pn() { [[ $1 =~ [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]_.+_.+ ]]; } # sanitizer regex for prefix declare -ag PROJECTS=() # this array will hold all of the projects for this run