From 9bd6c9d431857720a5b99f8beb7b2b5889c6dfe5 Mon Sep 17 00:00:00 2001
From: Asif Bacchus <asif@bacchus.cloud>
Date: Thu, 25 Oct 2018 09:12:01 -0600
Subject: [PATCH] Removed err check for sqldump, replaced w/ dumpfile > 0
 existance check

---
 root/scripts/backup.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/root/scripts/backup.sh b/root/scripts/backup.sh
index 550d42b..57737a4 100644
--- a/root/scripts/backup.sh
+++ b/root/scripts/backup.sh
@@ -565,15 +565,17 @@ fi
 ### Dump SQL
 echo -e "${op}${stamp} Dumping mailcow SQL database...${normal}" >> "$logFile"
 docker-compose exec mysql-mailcow mysqldump --default-character-set=utf8mb4 -u${DBUSER} -p${DBPASS} ${DBNAME} > "$sqlDumpDir/$sqlDumpFile" 2>> "$logFile"
-checkResult=$(docker-compose exec -T mysql-mailcow echo $?)
-# verify sql dump was successful
-if [ "$checkResult" = 0 ]; then
-    echo -e "${ok}${stamp} -- [SUCCESS] SQL successfully dumped --${normal}" \
-        >> "$logFile"
-else
-    exitError+=("${stamp}_201")
-fi
-
+## error checking sqldump within the container in a cron-friendly manner is a
+## nightmare, so let's just see if a non-empty file with the expected name was
+## created
+checkExist fs "$sqlDumpDir/$sqlDumpFile"
+    checkResult="$?"
+    if [ "$checkResult" = "0" ]; then
+        echo -e "${ok}${stamp} -- [SUCCESS] SQL successfully dumped --" \
+            "${normal}" >> "$logFile"
+    else
+        exitError+=("${stamp}_201")
+    fi
 
 ### Save redis state
 echo -e "${op}${stamp} Saving redis state information...${normal}" >> "$logFile"