From 472694c7aa00d59178c3a5bcb0ab6659cd54348f Mon Sep 17 00:00:00 2001 From: Martin Winkler Date: Sat, 10 Sep 2022 00:23:18 +0200 Subject: [PATCH] mysql - further unbound variable fixes --- seqs/mysql.sh | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/seqs/mysql.sh b/seqs/mysql.sh index 875332c..08d688c 100755 --- a/seqs/mysql.sh +++ b/seqs/mysql.sh @@ -73,16 +73,16 @@ step_10() { for arg in "$@" ; do case "${1:-}" in --charset|-c) - dbOption="$2" + dbOption="${2:-}" shift 2;; --database|-d) - dbName="$2" + dbName="${2:-}" shift 2 ;; --user|-u) - dbUser="$2" + dbUser="${2:-}" shift 2 ;; --remote|-r) - dbRemote="$2" + dbRemote="${2:-}" shift 2 ;; *) break ;; @@ -125,16 +125,16 @@ step_11() { for arg in "$@" ; do case "${1:-}" in --charset|-c) - dbOption="$2" + dbOption="${2:-}" shift 2;; --database|-d) - dbName="$2" + dbName="${2:-}" shift 2 ;; --user|-u) - dbUser="$2" + dbUser="${2:-}" shift 2 ;; --remote|-r) - dbRemote="$2" + dbRemote="${2:-}" shift 2 ;; *) break ;; @@ -177,16 +177,16 @@ step_12() { for arg in "$@" ; do case "${1:-}" in --charset|-c) - dbOption="$2" + dbOption="${2:-}" shift 2;; --database|-d) - dbName="$2" + dbName="${2:-}" shift 2 ;; --user|-u) - dbUser="$2" + dbUser="${2:-}" shift 2 ;; --remote|-r) - dbRemote="$2" + dbRemote="${2:-}" shift 2 ;; *) break ;; @@ -214,10 +214,10 @@ step_14() { for arg in "$@" ; do case "${1:-}" in --user|-u) - dbUser="$2" + dbUser="${2:-}" shift 2 ;; --remote|-r) - dbRemote="$2" + dbRemote="${2:-}" shift 2 ;; *) break ;; @@ -259,10 +259,10 @@ step_34() { for arg in "$@" ; do case "${1:-}" in --user|-u) - dbUser="$2" + dbUser="${2:-}" shift 2 ;; --remote|-r) - dbRemote="$2" + dbRemote="${2:-}" shift 2 ;; *) break ;; @@ -278,7 +278,7 @@ step_36_info() { } step_36_alias() { echo "sizedb"; } step_36() { - if [ -z "$2" ]; then + if [ -z "${2:-}" ]; then echo "Please provide a database name. e.g. $0 sizedb mydb_db" else exe mysql -u root -e 'SELECT table_schema "DB Name", @@ -300,13 +300,13 @@ step_50() { error -e "No database name provided" return 1 fi - local dbName="$1" - local buTarget="$2" - if [ -z "$2" ] ; then + local dbName="${1:-}" + local buTarget="${2:-}" + if [ -z "${2:-}" ] ; then warning -e "No target directory provided. Using home of current user" buTarget="$HOME" - elif [ ! -e "$2" ]; then - endReturn -o 1 -f "$2 does not exist" + elif [ ! -e "${2:-}" ]; then + endReturn -o 1 -f "${2:-} does not exist" fi echo " [I] Dumping database $dbName to $buTarget"