bryan/hartman-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename easyProjectDir

Browse Source
This commit is contained in:
Bryan Roessler
2024-08-01 14:22:27 -04:00
parent e3f4c1ee9c
commit e2b399a34c
2 changed files with 80 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
workflow/qhtcp-workflow
View File

@@ -592,10 +592,14 @@ easy() {
script="$EASY_DIR/EASYconsole.m"
# Prompt user for suffix
echo "Default EASY results directory: $EASY_RESULTS_DIR"
echo "Using default EASY results directory: $EASY_RESULTS_DIR"
((YES)) || read -r -p "Enter a custom suffix and/or hit enter to use the default (no suffix): " EASY_SUFFIX
[[ -n $EASY_SUFFIX ]] && EASY_RESULTS_DIR+="_$EASY_SUFFIX"
# This dirname is separate from the project's so multiple EASY results can be generated
declare -gx EASY_PROJECT_NAME="${EASY_RESULTS_DIR##*/}"
debug "EASY results output name: $EASY_PROJECT_NAME"
# Backup and create EASY results dirs
[[ -d $EASY_RESULTS_DIR ]] && backup "$EASY_RESULTS_DIR"
[[ -d $EASY_RESULTS_DIR ]] || mkdir -p "$EASY_RESULTS_DIR"
@@ -1566,22 +1570,23 @@ main() {
done
# Loop over projects
for PROJECT in "${PROJECTS[@]}"; do
declare -gx PROJECT_SCANS_DIR="$SCANS_DIR/$PROJECT"
declare -gx PROJECT_DATE="${PROJECT%"${PROJECT#????????}"}" # e.g. 20240723
declare -gx PROJECT_SUFFIX="${PROJECT#????????_*_}"
declare -gx PROJECT_USER="${PROJECT#????????_}"; PROJECT_USER="${PROJECT_USER%%_*}"
for PROJECT_NAME in "${PROJECTS[@]}"; do
declare -gx PROJECT_NAME
declare -gx PROJECT_SCANS_DIR="$SCANS_DIR/$PROJECT_NAME"
declare -gx PROJECT_DATE="${PROJECT_NAME%"${PROJECT_NAME#????????}"}" # e.g. 20240723
declare -gx PROJECT_SUFFIX="${PROJECT_NAME#????????_*_}"
declare -gx PROJECT_USER="${PROJECT_NAME#????????_}"; PROJECT_USER="${PROJECT_USER%%_*}"
declare -gx STUDIES_ARCHIVE_FILE="$OUT_DIR/StudiesDataArchive.txt"
declare -gx QHTCP_PROJECT_DIR="$OUT_DIR/$PROJECT"
declare -gx QHTCP_PROJECT_DIR="$OUT_DIR/$PROJECT_NAME"
declare -gx QHTCP_TEMPLATE_DIR="$TEMPLATES_DIR/qhtcp"
declare -gx STUDY_TEMPLATE_DIR="$TEMPLATES_DIR/exp"
declare -gx STUDY_INFO_FILE="$QHTCP_PROJECT_DIR/StudyInfo.csv"
declare -gx EASY_OUT_DIR="$QHTCP_PROJECT_DIR/easy"
if ((DEBUG)); then
declare -p SCANS_DIR OUT_DIR TEMPLATES_DIR APPS_DIR \
PROJECTS PROJECT \
PROJECT_SCANS_DIR PROJECT_DATE PROJECT_SUFFIX \
PROJECT_USER STUDIES_ARCHIVE_FILE QHTCP_PROJECT_DIR QHTCP_TEMPLATE_DIR \
PROJECTS PROJECT_NAME \
PROJECT_SCANS_DIR PROJECT_DATE PROJECT_SUFFIX PROJECT_USER \
STUDIES_ARCHIVE_FILE QHTCP_PROJECT_DIR QHTCP_TEMPLATE_DIR \
STUDY_TEMPLATE_DIR STUDY_INFO_FILE
fi