diff --git a/root/NCscripts/backup.sh b/root/NCscripts/backup.sh index 832f2aa..f4837ba 100755 --- a/root/NCscripts/backup.sh +++ b/root/NCscripts/backup.sh @@ -162,7 +162,7 @@ function cleanup { checkResult="$?" if [ "$checkResult" = "0" ]; then # directory still exists - exitWarn+=('111') + exitWarn+=("${stamp}_111") else # directory removed echo -e "${op}${stamp} Removed SQL temp directory${normal}" \ @@ -180,7 +180,7 @@ function cleanup { checkResult="$?" if [ "$checkResult" = "0" ]; then # file still exists - exitWarn+=('5030') + exitWarn+=("${stamp}_5030") else # file removed echo -e "${info}${stamp} -- [INFO] 503 page removed from webroot" \ @@ -453,7 +453,7 @@ if [ -z "$webroot" ]; then # no webroot path provided echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ >> "$logFile" - exitWarn+=('5031') + exitWarn+=("${stamp}_5031") clean503=0 else # verify webroot actually exists @@ -463,7 +463,7 @@ else # webroot directory specified could not be found echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ >> "$logFile" - exitWarn+=('5032') + exitWarn+=("{$stamp}_5032") clean503=0 else # webroot exists @@ -476,7 +476,7 @@ else # 503 file could not be found echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ >> "$logFile" - exitWarn+=('5033') + exitWarn+=("${stamp}_5033") clean503=0 else # 503 file exists and webroot is valid. Let's copy it! @@ -491,7 +491,7 @@ else # copy was unsuccessful echo -e "${info}${stamp} -- [INFO] ${warn503} --${normal}" \ >> "$logFile" - exitWarn+=('5035') + exitWarn+=("${stamp}_5035") clean503=0 else # copy was successful @@ -599,7 +599,7 @@ if [ -n "${borgConfig[3]}" ]; then echo -e "${op}${stamp} Borg SSH/REPO password... OK${normal}" >> "$logFile" export BORG_PASSPHRASE="${borgConfig[3]}" else - exitWarn+=('2111') + exitWarn+=("${stamp}_2111") # if the password was omitted by mistake, export a dummy password so borg # fails with an error instead of sitting and waiting for input export BORG_PASSPHRASE="DummyPasswordSoBorgFails" @@ -615,7 +615,7 @@ if [ -n "${borgConfig[7]}" ]; then echo -e "${op}${stamp} Borg REMOTE path... OK${normal}" >> "$logFile" export BORG_REMOTE_PATH="${borgConfig[7]}" else - exitWarn+=('2112') + exitWarn+=("${stamp}_2112") fi ## If borgXtra exists, map contents to an array variable @@ -630,13 +630,13 @@ if [ -n "$borgXtra" ]; then echo -e "${op}${stamp} Processed extra files list for inclusion in" \ "borgbackup${normal}" >> "$logFile" else - exitWarn+=('2113') + exitWarn+=("${stamp}_2113") fi else # no extra locations specified echo -e "${op}${stamp} No additional locations specified for backup." \ "Only NextCloud data files will be backed up${normal}" >> "$logFile" - exitWarn+=('2116') + exitWarn+=("${stamp}_2116") fi ## Check if borgExclude exists since borg will throw an error if it's missing @@ -650,7 +650,7 @@ if [ -n "$borgExclude" ]; then # file not found, unset the variable so it's like it was not specified # in the first place and continue with backup unset borgExclude - exitWarn+=('2114') + exitWarn+=("${stamp}_2114") fi else echo -e "${op}${stamp} Exclusion pattern file not specified." \ @@ -722,13 +722,13 @@ if [ "$borgResult" -eq 0 ]; then echo -e "${ok}${stamp} -- [SUCCESS] Borg backup completed successfully --" \ "${normal}" >> "$logFile" elif [ "$borgResult" -eq 1 ]; then - exitWarn+=('2200') + exitWarn+=("${stamp}_2200") elif [ "$borgResult" -ge 2 ]; then exitError+=('220') cleanup quit else - exitWarn+=('2201') + exitWarn+=("${stamp}_2201") fi ## Generate and execute borg prune @@ -745,15 +745,15 @@ if [ -n "$borgPrune" ]; then echo -e "${ok}${stamp} -- [SUCCESS] Borg prune completed successfully" \ "--${normal}" >> "$logFile" elif [ "$pruneResult" -eq 1 ]; then - exitWarn+=('2210') + exitWarn+=("${stamp}_2210") elif [ "$pruneResult" -ge 2 ]; then exitError+=('221') else - exitWarn+=('2212') + exitWarn+=("${stamp}_2212") fi else # parameters not defined... skip pruning - exitWarn+=('2115') + exitWarn+=("${stamp}_2115") fi