From 15945a7d06ef6d2dee304d8ae160da779d27a62c Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 3 May 2023 20:43:57 -0500
Subject: [PATCH] Update mysqlbu-scripts.sh

---
 mysqlbu-scripts.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/mysqlbu-scripts.sh b/mysqlbu-scripts.sh
index 5d4b91f..a210664 100755
--- a/mysqlbu-scripts.sh
+++ b/mysqlbu-scripts.sh
@@ -219,11 +219,7 @@ case $1 in
 		fi
 		
 		if [ "${BACKUP_TYPE}" == "xtrabackup" ] || [ "${BACKUP_TYPE}" == "both" ]; then
-			if [ "$BASE_BACKUP" = "" ]; then
-				$0 backup-base
-			else
-				$0 backup-incremental
-			fi
+			[ "$BASE_BACKUP" = "" ] && $0 backup-base || $0 backup-incremental
 		fi
 		if [ "${BACKUP_TYPE}" == "mysqldump" ] || [ "${BACKUP_TYPE}" == "both" ]; then
 			/usr/local/bin/mysqlbu mysqldump
@@ -296,10 +292,10 @@ case $1 in
 		if [ ! -z ${BACKUP_HOST_IP+x} ]; then BACKUPHOSTIP="--host=${BACKUP_HOST_IP}"; else BACKUPHOSTIP=""; fi
 		if [ ! -z ${BACKUP_HOST_PORT+x} ]; then BACKUPHOSTPORT="--port=${BACKUP_HOST_PORT}"; else BACKUPHOSTPORT=""; fi
 		
-		DATABASES=$(/usr/bin/mysql -u root --password='Dc$@54115' -e "SHOW DATABASES;" | tr -d "| " | grep -v Database)
+		DATABASES=$(/usr/bin/mysql -u ${MYSQLUSER} --password="${MYSQLPASS}" -e "SHOW DATABASES;" | tr -d "| " | grep -v Database)
 		for db in $DATABASES; do
 			FILE="${DEST_DIR}/$db.sql.gz"
-			/usr/bin/mysqldump --single-transaction --routines --quick -u $MYSQLUSER --password="${MYSQLPASS}" -B $db | gzip > "$FILE"
+			/usr/bin/mysqldump --single-transaction --routines --quick -u ${MYSQLUSER} --password="${MYSQLPASS}" -B $db | gzip > "$FILE"
 		done
 		
 ;;