marek-miklewicz/alt-mysql
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: reset parse_native_db_conf output on failure; use BASH_SOURCE for SCRIPT_DIR

Browse Source 
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Marek Miklewicz
2026-07-05 16:45:27 +02:00
parent b6016bafd8
commit d5040037d6
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/da-integration/alt_mysql_native_backup_restore.sh
+15 -1
View File
@@ -1,7 +1,7 @@
#!/bin/bash
set -Eeuo pipefail
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PLUGIN_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
COMMON_FILE="$PLUGIN_DIR/scripts/setup/mysql_common.sh"
SETTINGS_FILE="${DA_ALT_MYSQL_SETTINGS_FILE:-$PLUGIN_DIR/plugin-settings.conf}"
@@ -103,10 +103,24 @@ parse_native_db_conf() {
if [ -z "$NATIVE_DB_CHARSET" ]; then
log "missing db_collation charset in $conf_file"
NATIVE_DB_CHARSET=""
NATIVE_DB_COLLATION=""
NATIVE_DB_USER_NAMES=()
NATIVE_DB_USER_HOST=()
NATIVE_DB_USER_HASH=()
NATIVE_DB_USER_PLUGIN=()
NATIVE_DB_USER_PRIVS=()
return 1
fi
if [ "${#NATIVE_DB_USER_NAMES[@]}" -eq 0 ]; then
log "no MySQL users found in $conf_file"
NATIVE_DB_CHARSET=""
NATIVE_DB_COLLATION=""
NATIVE_DB_USER_NAMES=()
NATIVE_DB_USER_HOST=()
NATIVE_DB_USER_HASH=()
NATIVE_DB_USER_PLUGIN=()
NATIVE_DB_USER_PRIVS=()
return 1
fi