efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

mysql - fix unbound variable errors

Browse Source
This commit is contained in:
Martin Winkler
2022-08-29 14:49:46 +02:00
parent fa38b719f3
commit c5f8514819
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
seqs/mysql.sh
View File

@@ -71,7 +71,7 @@ step_10() {
shift shift
for arg in "$@" ; do for arg in "$@" ; do
case "$1" in case "${1:-}" in
--charset|-c) --charset|-c)
dbOption="$2" dbOption="$2"
shift 2;; shift 2;;
@@ -104,7 +104,7 @@ step_10() {
read -p "Enter database name: " dbName read -p "Enter database name: " dbName
fi fi
endCheckEmpty dbName "database name" endIfEmpty dbName "database name"
exe mysql -u root -e 'CREATE DATABASE '$dbName' '"$dbOption"';' exe mysql -u root -e 'CREATE DATABASE '$dbName' '"$dbOption"';'
endReturn -o $? "Cannot create database $dbName" endReturn -o $? "Cannot create database $dbName"
} }
@@ -123,7 +123,7 @@ step_11() {
shift shift
for arg in "$@" ; do for arg in "$@" ; do
case "$1" in case "${1:-}" in
--charset|-c) --charset|-c)
dbOption="$2" dbOption="$2"
shift 2;; shift 2;;
@@ -146,13 +146,13 @@ step_11() {
exe mysql -u root -e 'SELECT User, Host FROM mysql.user;' exe mysql -u root -e 'SELECT User, Host FROM mysql.user;'
read -p "Enter mysql user name: " dbUser read -p "Enter mysql user name: " dbUser
fi fi
endCheckEmpty dbUser "user name" endIfEmpty dbUser "user name"
if ! echo "SELECT COUNT(*) FROM mysql.user WHERE user = '$dbUser' AND host = '$dbRemote';" | mysql | grep 1 &>/dev/null; then if ! echo "SELECT COUNT(*) FROM mysql.user WHERE user = '$dbUser' AND host = '$dbRemote';" | mysql | grep 1 &>/dev/null; then
# User does not exist # User does not exist
if ! dry; then if ! dry; then
read -s -p "Enter mysql user password: " dbPass read -s -p "Enter mysql user password: " dbPass
endCheckEmpty dbPass "password" endIfEmpty dbPass "password"
else else
info "Enter mysql password: ...skipped..." info "Enter mysql password: ...skipped..."
fi fi
@@ -175,7 +175,7 @@ step_12() {
shift shift
for arg in "$@" ; do for arg in "$@" ; do
case "$1" in case "${1:-}" in
--charset|-c) --charset|-c)
dbOption="$2" dbOption="$2"
shift 2;; shift 2;;
@@ -212,7 +212,7 @@ step_14() {
shift shift
for arg in "$@" ; do for arg in "$@" ; do
case "$1" in case "${1:-}" in
--user|-u) --user|-u)
dbUser="$2" dbUser="$2"
shift 2 ;; shift 2 ;;
@@ -257,7 +257,7 @@ step_34() {
shift shift
for arg in "$@" ; do for arg in "$@" ; do
case "$1" in case "${1:-}" in
--user|-u) --user|-u)
dbUser="$2" dbUser="$2"
shift 2 ;; shift 2 ;;
@@ -296,7 +296,7 @@ step_50_info() {
step_50_alias() { echo "backup"; } step_50_alias() { echo "backup"; }
step_50() { step_50() {
shift # step number not used shift # step number not used
if [ -z $1 ] ; then if [ -z "${1:-}" ] ; then
error -e "No database name provided" error -e "No database name provided"
return 1 return 1
fi fi
@@ -327,15 +327,15 @@ step_52() {
readDatabaseInfos() { readDatabaseInfos() {
if [ "$dbName" == "" ] ; then if [ "$dbName" == "" ] ; then
read -p "Enter postgres database name: " dbName read -p "Enter postgres database name: " dbName
endCheckEmpty dbName "database" endIfEmpty dbName "database"
fi fi
if [ "$dbUser" == "" ] ; then if [ "$dbUser" == "" ] ; then
read -p "Enter postgres user name: " dbUser read -p "Enter postgres user name: " dbUser
endCheckEmpty dbUser "user name" endIfEmpty dbUser "user name"
fi fi
if [ "$dbPass" == "" ] ; then if [ "$dbPass" == "" ] ; then
read -s -p "Enter postgres password: " dbPass read -s -p "Enter postgres password: " dbPass
endCheckEmpty postgresPass "password" endIfEmpty postgresPass "password"
fi fi
echo echo
} }