wordpress-mysq: option $DO_NOT_USE_SSH respected when creating local new database

1 files changed, 21 insertions, 10 deletions

diff --git a/wordpress/wordpress-mysql b/wordpress/wordpress-mysql
index a9b0d21..a96b8e4 100755
--- a/wordpress/wordpress-mysql
+++ b/wordpress/wordpress-mysql
@@ -6,15 +6,29 @@ read_config()
         eval "$(jq -r '. | to_entries | .[] | .key + "=" + (.value | @sh) + "\n"')"
 }
 
-have_database()
+our_mysqladmin()
 {
         if [ "$DO_NOT_USE_SSH" ]
         then
-                set -- mysql --host="$db_host"
+                mysqladmin "$@"
         else
-                set -- ssh "$db_host" -- mysql
+                ssh -- "$db_host" mysqladmin "$@"
         fi
-        "$@" -ss <<END | (read match && [ "$match" ])
+}
+
+our_mysql()
+{
+        if [ "$DO_NOT_USE_SSH" ]
+        then
+                mysql --host="$db_host" "$@"
+        else
+                ssh -- "$db_host" mysql "$@"
+        fi
+}
+
+have_database()
+{
+        our_mysql -ss <<END | (read match && [ "$match" ])
 show databases where \`database\` = '${db_name//\'/\'\'}'
 END
 }
@@ -22,8 +36,8 @@ END
 create_new_mysql_database()
 {
         [ "$db_host" ]
-        ssh -- "$db_host" mysqladmin create "$db_name"
-        ssh -- "$db_host" mysql "$db_name" <<END
+        our_mysqladmin create "$db_name"
+        our_mysql "$db_name" <<END
 grant all privileges on \`$db_name\`.* to "$db_user" identified by "$db_password";
 END
 }
@@ -67,10 +81,7 @@ then
                 echo "$0: Warning: create_new_mysql_database: skipped" >&2
         fi
         exit
-elif [ "$DO_NOT_USE_SSH" ]
-then
-        exec mysql --host="$db_host" --user="$db_user" --password="$db_password" "$db_name"
 else
-        exec ssh -- "$db_host" mysql --user="$db_user" --password="$db_password" "$db_name"
+        our_mysql --user="$db_user" --password="$db_password" "$db_name"
 fi