From 2fbe90c0cb2639a35c6b48fb88e76980de6559f2 Mon Sep 17 00:00:00 2001
From: Bryan <bryan@tnet.space>
Date: Sun, 1 Nov 2020 12:59:20 -0600
Subject: [PATCH] fix bugs with dump routines

---
 src/borgwrapper | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/borgwrapper b/src/borgwrapper
index 37e784e..8d25cc1 100755
--- a/src/borgwrapper
+++ b/src/borgwrapper
@@ -33,7 +33,7 @@ error_handler () {
 
 save_package_list () {
     if ! which apt-mark; then
-        return 2
+        return
     fi
     
     if [ ! -d "${PACKAGE_LIST_DIRECTORY}" ]; then
@@ -45,7 +45,7 @@ save_package_list () {
 
 dump_sql () {
     if ! which mysqldump; then
-        return 2
+        return
     fi
     
     if [ ! -d "${MYSQL_DUMP_DIRECTORY}" ]
@@ -53,13 +53,13 @@ dump_sql () {
     fi
     
     for DB in $(mysql -u 'root' -e 'show databases' -s --skip-column-names); do
-        mysqldump --single-transaction -u 'root' "${DB}" > "${MYSQL_DUMP_DIRECTORY}${DB}.sql.bak";
+        mysqldump --single-transaction -u 'root' "${DB}" > "${MYSQL_DUMP_DIRECTORY}${DB}.sql.bak" || echo "mysqldump error"
     done
 }
 
 dump_mongo () {
     if ! which mongodump; then
-        return 2
+	return
     fi
     
     if [ ! -d "${MONGODB_DUMP_DIRECTORY}" ]
@@ -277,11 +277,16 @@ mkdir -p "${LOCKDIR}"
     elif [[ ${MODE} == "backup" ]]; then
         trap 'exit_backup $?' ERR INT TERM
         save_package_list
+        echo "saving package list"
         dump_mongo
+        echo "dumping mongo"
         dump_sql
+        echo "dumping sql"
         
         borg_backup
+	echo "running borg backup"
         borg_prune
+        echo "running borg prune"
         exit_backup 0
     elif [[ ${MODE} == "verify" ]]; then
         trap 'exit_verify $?' ERR INT TERM