From 1ea15caa87160de326447d92df719031a77d2dd5 Mon Sep 17 00:00:00 2001
From: Asif Bacchus <asif@programming.bacchus.network>
Date: Thu, 6 Sep 2018 01:28:09 -0600
Subject: [PATCH] Updated sqlDumpDir check to use new checkExist function

---
 root/scripts/borgbackup.sh | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/root/scripts/borgbackup.sh b/root/scripts/borgbackup.sh
index 0f26a6b..a4db90c 100755
--- a/root/scripts/borgbackup.sh
+++ b/root/scripts/borgbackup.sh
@@ -155,29 +155,29 @@ function quit {
 function checkExist {
     if [ "$1" = "find" ]; then
         if [ -e "$3" ]; then
-            echo -e "\e[0mFound: \e[0;33m${1}\e[0m" >> $logFileVerbose
+            echo -e "\e[0mFound: \e[0;33m${3}\e[0m" >> $logFileVerbose
             return 0
         elif [ "$2" = "createDir" ]; then
-            echo -e "\e[1;36mCreating: ${1}...\e[0m" >> $logFileVerbose
-            mkdir -p "$1"
+            echo -e "\e[1;36mCreating: ${3}...\e[0m" >> $logFileVerbose
+            mkdir -p "$3"
             echo -e "\e[0;36m...done\e[0m" >> $logFileVerbose
             return 1
         elif [ "$2" = "warn" ]; then
-            echo -e "\e[1;33m---WARNING: ${1} was not found---\e[0m" | \
+            echo -e "\e[1;33m---WARNING: ${3} was not found---\e[0m" | \
                 tee -a $logFileVerbose $logFileNormal >> $logFileQuiet
             exitWarning=1
             return 2
         elif [ "$2" = "error" ]; then
-            echo -e "\e[1;31m---ERROR: ${1} was not found---\e[0m" | \
+            echo -e "\e[1;31m---ERROR: ${3} was not found---\e[0m" | \
                 tee -a $logFileVerbose $logFileNormal >> $logFileQuiet
             quit 101
         fi
     elif [ "$1" = "verify" ]; then
-        if [ -e "$3" ]; then
-            echo -e "\e[0mConfirmed: \e[0;33m${1}\e[0m" >> $logFileVerbose
+        if [ -e "$2" ]; then
+            echo -e "\e[0mConfirmed: \e[0;33m${2}\e[0m" >> $logFileVerbose
             return 0
         else
-            echo -e "\e[1;31m---ERROR: Problem creating ${1}---\e[0m" | \
+            echo -e "\e[1;31m---ERROR: Problem creating ${2}---\e[0m" | \
                 tee -a $logFileVerbose $logFileNormal >> $logFileQuiet
             quit 102
         fi
@@ -221,6 +221,14 @@ fi
 export logFile="$logFile"
 
 ## Check for sqlDumpDir and create if necessary
+checkExist find createDir $sqlDumpDir
+checkResult="$?"
+if [ "$checkResult" = "1" ]; then
+    # verify creation successful
+    checkExist verify $sqlDumpDir
+fi
+
+
 if [ -e $sqlDumpDir ]; then
     echo -e "\e[0m[`date +%Y-%m-%d` `date +%H:%M:%S`] Confirmed:" \
         "sqlDumpDir exists at \e[0;33m$sqlDumpDir\e[0m" >> $logFile