From af035719f8aaae6f1ec33f416ff39b71efc186b9 Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Thu, 6 Sep 2018 03:14:19 -0600 Subject: [PATCH] Updated SQL dump section to use new quit function --- root/scripts/borgbackup.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/root/scripts/borgbackup.sh b/root/scripts/borgbackup.sh index 8a7054a..e18bef5 100755 --- a/root/scripts/borgbackup.sh +++ b/root/scripts/borgbackup.sh @@ -293,16 +293,16 @@ mapfile -t sqlParams < $sqlDetails ## Dump SQL echo -e "\e[1;36m[`date +%Y-%m-%d` `date +%H:%M:%S`]" \ - "Dumping SQL...\e[0m" >> $logFile + "Dumping SQL...\e[0m" >> $logFileVerbose mysqldump --single-transaction -h${sqlParams[0]} -u${sqlParams[1]} \ - -p${sqlParams[2]} ${sqlParams[3]} > "$sqlDumpDir/$sqlDumpFile" 2>> $logFile + -p${sqlParams[2]} ${sqlParams[3]} > "$sqlDumpDir/$sqlDumpFile" \ + 2>> $logFileVerbose +dumpResult="$?" # verify -if [ "$?" = "0" ]; then - echo -e "\e[0;36m...done\e[0m" >> $logFile +if [ "$dumpResult" = "0" ]; then + echo -e "\e[0;36m...done\e[0m" >> $logFileVerbose else - echo -e "\e[1;31m--Error-- There was a problem dumping SQL." >> $logFile - echo -e "\e[4;31mScript aborted\e[0;31m.\e[0m" >> $logFile - exit 201 + quit 200 fi ## Ready for Borg