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

Improve make scans dir

Browse Source
This commit is contained in:
Bryan Roessler
2024-07-29 12:45:18 -04:00
parent c323eef935
commit 5e0af19181
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/qhtcp-workflow
View File

@@ -1472,6 +1472,7 @@ main() {
TEMPLATES_DIR="$SCRIPT_DIR/templates" TEMPLATES_DIR="$SCRIPT_DIR/templates"
APPS_DIR="$SCRIPT_DIR/apps" APPS_DIR="$SCRIPT_DIR/apps"
DATE="$(date +%Y%m%d)" # change in EASYConsole.m to match DATE="$(date +%Y%m%d)" # change in EASYConsole.m to match
SCANS_HEIRARCHY=("./scans" "/mnt/data/scans" "/mnt/data/ExpJobs" "./scans")
SCANS_HEIRARCHY=("./scans" "/mnt/data/scans" "/mnt/data/ExpJobs" "./scans") # search for a scans dir in this order (and fall back to default) 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 # Find a scans directory
[[ -z $SCANS_DIR ]] && for d in "${SCANS_HEIRARCHY[@]}"; do [[ -z $SCANS_DIR ]] && for d in "${SCANS_HEIRARCHY[@]}"; do
@@ -1479,6 +1480,15 @@ main() {
SCANS_DIR="$d" SCANS_DIR="$d"
fi fi
done done
if ! [[ -d $SCANS_DIR ]]; then
# This is not somethign we do often, so ask
if ask "Create the scans directory: $SCANS_DIR?"; then
mkdir -p "$SCANS_DIR"
else
echo "No scans directory available, exiting"
exit 1;
fi
fi
echo "Using scans directory: $SCANS_DIR" echo "Using scans directory: $SCANS_DIR"
echo "Change the SCANS environment variable to override" echo "Change the SCANS environment variable to override"
echo "Example: SCANS=/path/to/scans ./qhtcp-workflow" echo "Example: SCANS=/path/to/scans ./qhtcp-workflow"