From 879c70e1f7668d5a834e6f9168e5022e8d109dff Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 30 Oct 2022 17:47:41 -0500
Subject: [PATCH] Update mysqlbu-scripts.sh

---
 mysqlbu-scripts.sh | 67 +++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 21 deletions(-)

diff --git a/mysqlbu-scripts.sh b/mysqlbu-scripts.sh
index d46ae62..1f4663d 100755
--- a/mysqlbu-scripts.sh
+++ b/mysqlbu-scripts.sh
@@ -203,31 +203,56 @@ DELETE_MENU() {
 
 case $1 in
 	'backup')
-		if [ "$BASE_BACKUP" = "" ]; then
-			$0 backup-base
-		else
-			$0 backup-incremental
+		if [ "$BACKUP_ServerName" != "" ]; then
+			echo "$(date) - Checking for mounted Backup Drive..."
+			if [ ! -f ${BACKUP_PATH}/mounted ]; then
+				echo "$(date) - Not found, mounting drive now..."
+				mount.cifs ${BACKUP_ServerName} ${BACKUP_PATH} -o user=${BACKUP_UserName},password=${BACKUP_Password}
+				c=0	
+				until [ $c -gt 179 ]; do
+					if [ -f ${BACKUP_PATH}/mounted ]; then
+						echo "$(date) - Backup Drive mounted"
+						c=10000
+					else
+						((c++))
+						sleep 1s
+					fi
+				done
+				if [ $c != 10000 ]; then
+					echo "$(date) - Backup Drive COULD NOT be mounted... exiting"
+					exit 1
+				fi
+			else
+				echo "$(date) - Backup Drive already mounted"
+			fi
+			
 		fi
 		
-		/usr/local/bin/mysqlbu mysqldump
+		if [ "$BASE_BACKUP" = "" ]; then
+			#$0 backup-base
+		else
+			#$0 backup-incremental
+		fi
 		
-		LATEST_BACKUP="`ls -1t $DAY_BACKUP_DIR | grep --max-count=1 --perl-regexp '^.+-'`"
-		ln -sfn ${DAY_BACKUP_DIR/${BACKUP_PATH}/.}${LATEST_BACKUP} ${BACKUP_PATH}/latest
+		#/usr/local/bin/mysqlbu mysqldump
 		
-		allfiles=`ls -1 ${BACKUP_PATH}`
-		files=(`ls -1 ${BACKUP_PATH} | tail -$((${BACKUPSTOKEEP}+2))`)
-		for i in $allfiles; do 
-			keep=0; 
-			for a in ${files[@]}; do 
-				if [ $i == $a ]; then 
-					keep=1;
-					break
-				fi; 
-			done; 
-			if [ $keep == 0 ]; then 
-				rm -rf ${BACKUP_PATH}/$i;
-			fi;
-		done
+		# LATEST_BACKUP="`ls -1t $DAY_BACKUP_DIR | grep --max-count=1 --perl-regexp '^.+-'`"
+		# ln -sfn ${DAY_BACKUP_DIR/${BACKUP_PATH}/.}${LATEST_BACKUP} ${BACKUP_PATH}/latest
+		#
+		# allfiles=`ls -1 ${BACKUP_PATH}`
+		# files=(`ls -1 ${BACKUP_PATH} | tail -$((${BACKUPSTOKEEP}+2))`)
+		# for i in $allfiles; do
+		# 	keep=0;
+		# 	for a in ${files[@]}; do
+		# 		if [ $i == $a ]; then
+		# 			keep=1;
+		# 			break
+		# 		fi;
+		# 	done;
+		# 	if [ $keep == 0 ]; then
+		# 		rm -rf ${BACKUP_PATH}/$i;
+		# 	fi;
+		# done
 ;;
     'backup-base')
 		DEST_DIR="${DAY_BACKUP_DIR}`date +%H-%M-%S`_BASE"