Skip to content

Commit 6ab7332

Browse files
fix: wrong error output after env variable check in import/export scripts (#3)
Ensure the error message is displayed correctly when a required env variable is missing: add missing "echo" command and put the variable name in simple quotes instead of backticks so that it's not executed as a command. Fixes issue #1. Co-authored-by: Jose Quintana <1700322+joseluisq@users.noreply.github.com>
1 parent 447d5d6 commit 6ab7332

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

8.0/scripts/___mysqlexport.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ XDB_EXPORT_GZIP="$DB_EXPORT_GZIP"
1111
XDB_EXPORT=
1212

1313
# Required env variables
14-
if [[ -z "$DB_NAME" ]]; then "ERROR: `DB_NAME` env variable is required."; exit 1; fi
15-
if [[ -z "$DB_USERNAME" ]]; then "ERROR: `DB_USERNAME` env variable is required."; exit 1; fi
16-
if [[ -z "$DB_PASSWORD" ]]; then "ERROR: `DB_PASSWORD` env variable is required."; exit 1; fi
14+
if [[ -z "$DB_NAME" ]]; then echo "ERROR: 'DB_NAME' env variable is required."; exit 1; fi
15+
if [[ -z "$DB_USERNAME" ]]; then echo "ERROR: 'DB_USERNAME' env variable is required."; exit 1; fi
16+
if [[ -z "$DB_PASSWORD" ]]; then echo "ERROR: 'DB_PASSWORD' env variable is required."; exit 1; fi
1717

1818
# Optional env variables
1919
if [[ -z "$XDB_PROTO" ]]; then XDB_PROTO="tcp"; fi

8.0/scripts/___mysqlimport.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ XDB_IMPORT_GZIP="$DB_IMPORT_GZIP"
1313
XDB_IMPORT=
1414

1515
# Required env variables
16-
if [[ -z "$DB_NAME" ]]; then "ERROR: `DB_NAME` env variable is required."; exit 1; fi
17-
if [[ -z "$DB_USERNAME" ]]; then "ERROR: `DB_USERNAME` env variable is required."; exit 1; fi
18-
if [[ -z "$DB_PASSWORD" ]]; then "ERROR: `DB_PASSWORD` env variable is required."; exit 1; fi
19-
if [[ -z "$DB_IMPORT_FILE_PATH" ]]; then "ERROR: `DB_IMPORT_FILE_PATH` env variable is required."; exit 1; fi
16+
if [[ -z "$DB_NAME" ]]; then echo "ERROR: 'DB_NAME' env variable is required."; exit 1; fi
17+
if [[ -z "$DB_USERNAME" ]]; then echo "ERROR: 'DB_USERNAME' env variable is required."; exit 1; fi
18+
if [[ -z "$DB_PASSWORD" ]]; then echo "ERROR: 'DB_PASSWORD' env variable is required."; exit 1; fi
19+
if [[ -z "$DB_IMPORT_FILE_PATH" ]]; then echo "ERROR: 'DB_IMPORT_FILE_PATH' env variable is required."; exit 1; fi
2020

2121
# Optional env variables
2222
if [[ -z "$XDB_PROTO" ]]; then XDB_PROTO="tcp"; fi

0 commit comments

Comments
 (0)