From e5882023928bb624e1680dafa530e8121bd2df15 Mon Sep 17 00:00:00 2001
From: uprightbass360 <uprightbass360@gmail.com>
Date: Mon, 27 Oct 2025 18:11:33 -0400
Subject: [PATCH] fix: add backup params

---
 backup-export.sh | 33 ++++++++++++++++-----------------
 backup-import.sh | 40 ++++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/backup-export.sh b/backup-export.sh
index 3b8a06e..d74e2fc 100755
--- a/backup-export.sh
+++ b/backup-export.sh
@@ -28,27 +28,26 @@ case "${1:-}" in
   -h|--help) usage; exit 0;;
 esac
 
-MYSQL_PW="$2"
-DB_AUTH="$3"
-DB_CHAR="$4"
-
-# Check if required parameters are provided
-if [[ -z "$MYSQL_PW" ]]; then
-  echo "Error: MySQL password required as second argument." >&2
+# Check if required parameters are provided (minimum 3: password, auth_db, char_db)
+if [[ $# -lt 3 ]]; then
+  echo "Error: Required parameters missing. Usage: ./backup-export.sh [output_dir] <mysql_password> <auth_db> <characters_db>" >&2
   exit 1
 fi
 
-if [[ -z "$DB_AUTH" ]]; then
-  echo "Error: Auth database name required as third argument." >&2
-  exit 1
+# Handle both cases: with and without output_dir parameter
+if [[ $# -eq 3 ]]; then
+  # No output_dir provided, use default
+  DEST_PARENT="."
+  MYSQL_PW="$1"
+  DB_AUTH="$2"
+  DB_CHAR="$3"
+elif [[ $# -ge 4 ]]; then
+  # output_dir provided
+  DEST_PARENT="$1"
+  MYSQL_PW="$2"
+  DB_AUTH="$3"
+  DB_CHAR="$4"
 fi
-
-if [[ -z "$DB_CHAR" ]]; then
-  echo "Error: Characters database name required as fourth argument." >&2
-  exit 1
-fi
-
-DEST_PARENT="${1:-.}"
 TIMESTAMP="$(date +%Y%m%d_%H%M%S)"
 DEST_DIR="${DEST_PARENT%/}/ExportBackup_${TIMESTAMP}"
 mkdir -p "$DEST_DIR"
diff --git a/backup-import.sh b/backup-import.sh
index d5a2704..813bfb6 100755
--- a/backup-import.sh
+++ b/backup-import.sh
@@ -43,31 +43,27 @@ case "${1:-}" in
   -h|--help) usage; exit 0;;
 esac
 
-BACKUP_DIR="${1:-ImportBackup}"
-MYSQL_PW="$2"
-DB_AUTH="$3"
-DB_CHAR="$4"
-DB_WORLD="$5"
-
-# Check if required parameters are provided
-if [[ -z "$MYSQL_PW" ]]; then
-  err "MySQL password required as second argument."
+# Check if required parameters are provided (minimum 4: password, auth_db, char_db, world_db)
+if [[ $# -lt 4 ]]; then
+  err "Required parameters missing. Usage: ./backup-import.sh [backup_dir] <mysql_password> <auth_db> <characters_db> <world_db>"
   exit 1
 fi
 
-if [[ -z "$DB_AUTH" ]]; then
-  err "Auth database name required as third argument."
-  exit 1
-fi
-
-if [[ -z "$DB_CHAR" ]]; then
-  err "Characters database name required as fourth argument."
-  exit 1
-fi
-
-if [[ -z "$DB_WORLD" ]]; then
-  err "World database name required as fifth argument."
-  exit 1
+# Handle both cases: with and without backup_dir parameter
+if [[ $# -eq 4 ]]; then
+  # No backup_dir provided, use default
+  BACKUP_DIR="ImportBackup"
+  MYSQL_PW="$1"
+  DB_AUTH="$2"
+  DB_CHAR="$3"
+  DB_WORLD="$4"
+elif [[ $# -ge 5 ]]; then
+  # backup_dir provided
+  BACKUP_DIR="$1"
+  MYSQL_PW="$2"
+  DB_AUTH="$3"
+  DB_CHAR="$4"
+  DB_WORLD="$5"
 fi
 
 require_file(){