backup/backup.sh

@@ -469,6 +469,28 @@ printf "%s[%s] -- [INFO] %s%s%s imported --%s\n" \
 printf "%s[%s] -- [INFO] Verifying supplied borg details --%s\n" \
     "$cyan" "$(stamp)" "$norm" >> "$logFile"
 
+## read additional files -- this is required otherwise nothing to backup!
+if [ -z "${borgXtraListPath}" ]; then
+    badDetails empty 'xtraLocations'
+else
+    # check if file actually exists
+    if [ ! -f "${borgXtraListPath}" ]; then
+        badDetails dne 'borgXtraListPath'
+    fi
+    # read file contents into concatenated list for echo to cmdline
+    while read -r xtraItem; do
+        if [ -z "${xtraList}" ]; then
+            xtraList="${xtraItem}"
+        else
+            xtraList="${xtraList} ${xtraItem}"
+        fi
+    done <<EOF
+    $( sed -e '/^\s*#.*$/d' -e '/^\s*$/d' "${borgXtraListPath}" )
+EOF
+printf "%sdetails:borgXtraListPath %s-- %s[OK]%s\n" \
+    "$magenta" "$norm" "$ok" "$norm" >> "$logFile"
+fi
+
 ## verify borg base directory
 if [ -z "${borgBaseDir}" ]; then
     badDetails empty 'borgBaseDir'
@@ -537,28 +559,6 @@ if [ -n "${borgExcludeListPath}" ]; then
 exclusions=1
 fi
 
-## read additional files
-if [ -z "${borgXtraListPath}" ]; then
-    xtraList=''
-else
-    # check if file actually exists
-    if [ ! -f "${borgXtraListPath}" ]; then
-        badDetails dne 'borgXtraListPath'
-    fi
-    # read file contents into concatenated list for echo to cmdline
-    while read -r xtraItem; do
-        if [ -z "${xtraList}" ]; then
-            xtraList="${xtraItem}"
-        else
-            xtraList="${xtraList} ${xtraItem}"
-        fi
-    done <<EOF
-    $( sed -e '/^\s*#.*$/d' -e '/^\s*$/d' "${borgXtraListPath}" )
-EOF
-printf "%sdetails:borgXtraListPath %s-- %s[OK]%s\n" \
-    "$magenta" "$norm" "$ok" "$norm" >> "$logFile"
-fi
-
 
 ### set location of sql dump
 # this is done before resetting default TMP dir for borg
@@ -670,7 +670,6 @@ printf "%s[%s] -- [INFO] Pre-backup tasks completed, calling borgbackup --%s\n"
 if [ "$exclusions" -eq 0 ]; then
     borgCMD="borg --show-rc create ${borgCreateParams} \
         ::$(date +%Y-%m-%d_%H%M%S) \
-        ${mcConfig%/*} \
         ${sqlDumpDir} \
         ${dockerVolumeMail} \
         ${dockerVolumeRspamd} \
@@ -682,7 +681,6 @@ elif [ "$exclusions" -eq 1 ]; then
     borgCMD="borg --show-rc create ${borgCreateParams} \
         --exclude-from ${borgExcludeListPath} \
         ::$(date +%Y-%m-%d_%H%M%S) \
-        ${mcConfig%/*} \
         ${sqlDumpDir} \
         ${dockerVolumeMail} \
         ${dockerVolumeRspamd} \