moved 503 pre-req check for clarity in logs

This commit is contained in:
Asif Bacchus 2019-05-24 22:37:01 -06:00
parent 0734b8401e
commit 7ffeb71de1

View File

@ -239,16 +239,6 @@ if ! command -v borg > /dev/null; then
printf "\n${err}ERROR: BORG is not installed on this system!${norm}\n\n" printf "\n${err}ERROR: BORG is not installed on this system!${norm}\n\n"
exit 3 exit 3
fi fi
# 503 functionality
if [ $use503 -eq 1 ]; then
if [ ! -f "$err503Path" ]; then
badParam dne "(--503-path default)" "$err503Path"
elif [ ! -d "$webroot" ]; then
badParam dne "(--webroot default)" "$webroot"
fi
printf "${cyan}[%s] -- [INFO] Using 503 functionality --${norm}\n" \
"$(stamp)" >> "$logFile"
fi
# seafile directories # seafile directories
if [ ! -d "$seafDir" ]; then if [ ! -d "$seafDir" ]; then
badParam dne "(--seafdir default)" "$seafDir" badParam dne "(--seafdir default)" "$seafDir"
@ -267,6 +257,16 @@ if [ $offlineBackup -eq 1 ]; then
badParam svc "(--seahub-service default)" "$seafHub" badParam svc "(--seahub-service default)" "$seafHub"
fi fi
fi fi
# if 503 functionality is enabled, do 503 related files exist?
if [ $use503 -eq 1 ]; then
if [ ! -f "$err503Path" ]; then
badParam dne "(--503-path default)" "$err503Path"
elif [ ! -d "$webroot" ]; then
badParam dne "(--webroot default)" "$webroot"
fi
printf "${cyan}[%s] -- [INFO] Using 503 functionality --${norm}\n" \
"$(stamp)" >> "$logFile"
fi
### start logging ### start logging