remove junk, add help text

backup-export.sh

@@ -23,12 +23,12 @@ EXPLICIT_SELECTION=false
 
 usage(){
   cat <<'EOF'
-Usage: ./backup-export.sh [options] [legacy positional args]
+Usage: ./backup-export.sh [options]
 
 Creates a timestamped backup of one or more ACore databases.
 
 Options:
-  -o, --output DIR          Destination directory (default: script directory)
+  -o, --output DIR          Destination directory (default: storage/backups)
   -p, --password PASS       MySQL root password
       --auth-db NAME        Auth database schema name
       --characters-db NAME  Characters database schema name
@@ -38,13 +38,17 @@ Options:
   -h, --help                Show this help and exit
 
 Supported database identifiers: auth, characters, world.
+By default exports auth and characters if database names are provided.
 
-Legacy positional forms are still supported:
+Examples:
-  ./backup-export.sh <mysql_password> <auth_db> <characters_db>
+  # Export all databases to default location
-  ./backup-export.sh <mysql_password> <auth_db> <characters_db> <world_db>
+  ./backup-export.sh --password azerothcore123 --auth-db acore_auth --characters-db acore_characters --world-db acore_world --all
-  ./backup-export.sh <output_dir> <mysql_password> <auth_db> <characters_db> [world_db]
 
-In legacy mode all provided databases are exported.
+  # Export specific databases to custom directory
+  ./backup-export.sh --output /path/to/backups --password azerothcore123 --db auth,characters --auth-db acore_auth --characters-db acore_characters
+
+  # Export only world database
+  ./backup-export.sh --password azerothcore123 --db world --world-db acore_world
 EOF
 }
 
@@ -180,37 +184,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 if ((${#POSITIONAL[@]} > 0)); then
-  case ${#POSITIONAL[@]} in
+  die "Positional arguments are not supported. Use named options instead."
-    3)
-      MYSQL_PW="${POSITIONAL[0]}"
-      DB_NAMES[auth]="${POSITIONAL[1]}"
-      DB_NAMES[characters]="${POSITIONAL[2]}"
-      INCLUDE_DBS=(auth characters)
-      EXPLICIT_SELECTION=true
-      ;;
-    4)
-      DEST_PARENT="${POSITIONAL[0]}"
-      DEST_PROVIDED=true
-      MYSQL_PW="${POSITIONAL[1]}"
-      DB_NAMES[auth]="${POSITIONAL[2]}"
-      DB_NAMES[characters]="${POSITIONAL[3]}"
-      INCLUDE_DBS=(auth characters)
-      EXPLICIT_SELECTION=true
-      ;;
-    5)
-      DEST_PARENT="${POSITIONAL[0]}"
-      DEST_PROVIDED=true
-      MYSQL_PW="${POSITIONAL[1]}"
-      DB_NAMES[auth]="${POSITIONAL[2]}"
-      DB_NAMES[characters]="${POSITIONAL[3]}"
-      DB_NAMES[world]="${POSITIONAL[4]}"
-      INCLUDE_DBS=(auth characters world)
-      EXPLICIT_SELECTION=true
-      ;;
-    *)
-      die "Unrecognized positional arguments. Run --help for usage."
-      ;;
-  esac
 fi
 
 declare -a ACTIVE_DBS=()

backup-import.sh

@@ -39,25 +39,28 @@ Usage: ./backup-import.sh [options]
 Restores selected ACore databases from a backup directory.
 
 Options:
-  -b, --backup-dir DIR      Backup directory (default: ImportBackup/)
+  -b, --backup-dir DIR      Backup directory (required)
   -p, --password PASS       MySQL root password
       --auth-db NAME        Auth database schema name
       --characters-db NAME  Characters database schema name
       --world-db NAME       World database schema name
-      --db LIST             Comma-separated list of databases to import; may be repeated
+      --db LIST             Comma-separated list of databases to import
       --skip LIST           Comma-separated list of databases to skip
       --all                 Import all supported databases
   -h, --help                Show this help and exit
 
 Supported database identifiers: auth, characters, world.
-By default the script restores auth and characters. Use --db/--skip to
+By default the script restores auth and characters databases.
-customize the selection.
 
-Legacy positional forms are still supported:
+Examples:
-  ./backup-import.sh <mysql_password> <auth_db> <characters_db> <world_db>
+  # Restore from specific backup directory
-  ./backup-import.sh <backup_dir> <mysql_password> <auth_db> <characters_db> <world_db>
+  ./backup-import.sh --backup-dir /path/to/backup --password azerothcore123 --auth-db acore_auth --characters-db acore_characters
 
-Legacy usage always imports the databases provided in the invocation.
+  # Restore all databases
+  ./backup-import.sh --backup-dir ./storage/backups/ExportBackup_20241029_120000 --password azerothcore123 --all --auth-db acore_auth --characters-db acore_characters --world-db acore_world
+
+  # Restore only world database
+  ./backup-import.sh --backup-dir ./backups/daily/latest --password azerothcore123 --db world --world-db acore_world
 EOF
 }
 
@@ -376,29 +379,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 if ((${#POSITIONAL[@]} > 0)); then
-  case ${#POSITIONAL[@]} in
+  fatal "Positional arguments are not supported. Use named options instead."
-    4)
-      MYSQL_PW="${POSITIONAL[0]}"
-      DB_NAMES[auth]="${POSITIONAL[1]}"
-      DB_NAMES[characters]="${POSITIONAL[2]}"
-      DB_NAMES[world]="${POSITIONAL[3]}"
-      INCLUDE_DBS=(auth characters world)
-      EXPLICIT_SELECTION=true
-      ;;
-    5)
-      BACKUP_DIR="${POSITIONAL[0]}"
-      BACKUP_PROVIDED=true
-      MYSQL_PW="${POSITIONAL[1]}"
-      DB_NAMES[auth]="${POSITIONAL[2]}"
-      DB_NAMES[characters]="${POSITIONAL[3]}"
-      DB_NAMES[world]="${POSITIONAL[4]}"
-      INCLUDE_DBS=(auth characters world)
-      EXPLICIT_SELECTION=true
-      ;;
-    *)
-      fatal "Unrecognized positional arguments. Run --help for usage."
-      ;;
-  esac
 fi
 
 if $EXPLICIT_SELECTION; then
@@ -418,33 +399,7 @@ fi
 if $BACKUP_PROVIDED; then
   BACKUP_DIR="$(resolve_relative "$INVOCATION_DIR" "$BACKUP_DIR")"
 else
-  # Auto-discover backup directory from available options
+  fatal "Backup directory is required. Use --backup-dir DIR to specify."
-  BACKUP_SEARCH_PATHS=(
-    "$SCRIPT_DIR/ImportBackup"
-    "$SCRIPT_DIR/storage/backups"
-    "$SCRIPT_DIR/manual-backups"
-    "/backups"
-    "/var/lib/mysql-persistent"
-  )
-
-  BACKUP_DIR=""
-  for candidate in "${BACKUP_SEARCH_PATHS[@]}"; do
-    if [ -d "$candidate" ] && [ -n "$(ls -A "$candidate" 2>/dev/null)" ]; then
-      # Check if this directory contains backups
-      if [ -d "$candidate/daily" ] || [ -d "$candidate/hourly" ] || \
-         ls "$candidate"/*.sql.gz >/dev/null 2>&1 || ls "$candidate"/*.sql >/dev/null 2>&1 || \
-         ls "$candidate"/ExportBackup_* >/dev/null 2>&1 || ls "$candidate"/20[0-9][0-9][0-9][0-9][0-9][0-9]_* >/dev/null 2>&1; then
-        log "Auto-discovered backup directory: $candidate"
-        BACKUP_DIR="$candidate"
-        break
-      fi
-    fi
-  done
-
-  if [ -z "$BACKUP_DIR" ]; then
-    BACKUP_DIR="$SCRIPT_DIR/ImportBackup"
-    warn "No backup directory auto-discovered, using default: $BACKUP_DIR"
-  fi
 fi
 
 [[ -d "$BACKUP_DIR" ]] || fatal "Backup directory not found: $BACKUP_DIR"