From 7ffeb71de141dd3b307d8a0505b59de50e83c1e4 Mon Sep 17 00:00:00 2001
From: Asif Bacchus <asif@linuxprogramming.mshome.net>
Date: Fri, 24 May 2019 22:37:01 -0600
Subject: [PATCH] moved 503 pre-req check for clarity in logs

---
 backup_new.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/backup_new.sh b/backup_new.sh
index fec6e46..0d9cb8b 100755
--- a/backup_new.sh
+++ b/backup_new.sh
@@ -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"
     exit 3
 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
 if [ ! -d "$seafDir" ]; then
     badParam dne "(--seafdir default)" "$seafDir"
@@ -267,6 +257,16 @@ if [ $offlineBackup -eq 1 ]; then
         badParam svc "(--seahub-service default)" "$seafHub"
     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