From 08ab44ce84954738bc056ef1d97a8878330bcbc0 Mon Sep 17 00:00:00 2001
From: Asif Bacchus <asif@linuxprogramming.mshome.net>
Date: Sat, 25 May 2019 12:33:35 -0600
Subject: [PATCH] func cleanup to remove script working files

---
 backup_new.sh | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/backup_new.sh b/backup_new.sh
index 7b531c0..2910853 100755
--- a/backup_new.sh
+++ b/backup_new.sh
@@ -34,9 +34,32 @@ badParam () {
     fi
 }
 
+# cleanup
+cleanup () {
+    # cleanup 503 if copied
+    if [ $err503Copied -eq 1 ]; then
+        if ! rm -f "$webroot/$err503File" 2>>"$logFile"; then
+            printf "${warn}[%s] -- [WARNING] Could not remove 503 error page." \
+                "$(stamp)" >> "$logFile"
+            printf " Web interface will not function until this file is " \
+                >> "$logFile"
+            printf "removed --${norm}\n" >> "$logFile"
+        fi
+    fi
+    if [ $sqlCopied -eq 1 ]; then
+        if ! rm -rf "$sqlDumpDir" 2>>"$logFile"; then
+            printf "${warn}[%s] -- [WARNING]  Could not remove temporary " \
+                "$(stamp)" >> "$logFile"
+            printf "SQL dump directory at $sqlDumpDir. " >> "$logFile"
+            printf "Remove manually to free up space.${norm}\n" >> "$logFile"
+        fi
+    fi
+}
+
 exitError () {
     printf "${err}[%s] -- [ERROR] %s: %s --${norm}\n" \
             "$(stamp)" "$1" "$2" >> "$logFile"
+    cleanup
     exit "$1"
 }
 
@@ -79,6 +102,8 @@ logFile="$scriptPath/${scriptName%.*}.log"
 borgCreateParams='--stats'
 borgPruneParams='--list'
 configDetails="$scriptPath/seafbackup.details"
+err503Copied=0
+sqlCopied=0
 
 # 503 related
 use503=0
@@ -286,6 +311,8 @@ if [ $use503 -eq 1 ]; then
     else
         printf "${ok}[%s] -- [SUCCESS] 503 error page copied --${norm}\n" \
             "$(stamp)" >> "$logFile"
+        # set cleanup flag
+        err503Copied=1
     fi
 fi
 
@@ -348,7 +375,8 @@ if ! mysqldump -h"${sqlServer}" -u"${sqlUser}" -p"${sqlPass}" \
 fi
 printf "${ok}[%s] -- [SUCCESS] SQL databases dumped successfully --${norm}\n" \
     "$(stamp)" >> "$logFile"
-
+# set cleanup flag
+sqlCopied=1