1 files changed, 17 insertions, 4 deletions

diff --git a/wordpress/wordpress-mysql b/wordpress/wordpress-mysql
index 9faf3c3..96f6141 100755
--- a/wordpress/wordpress-mysql
+++ b/wordpress/wordpress-mysql
@@ -1,9 +1,13 @@
 #!/bin/bash
 set -e
+set -o pipefail
 
-read_config()
+json_to_shell()
 {
-        eval "$(jq -r '. | to_entries | .[] | .key + "=" + (.value | @sh) + "\n"')"
+        jq -r '{ db_user, db_password, db_host, db_name } |
+                to_entries |
+                .[] |
+                @sh "declare \(.key)=\(.value);" '
 }
 
 our_mysqladmin()
@@ -28,7 +32,16 @@ create_new_mysql_database()
         [ "$db_host" ]
         our_mysqladmin create "$db_name"
         our_mysql "$db_name" <<END
-grant all privileges on \`$db_name\`.* to "$db_user" identified by "$db_password";
+grant
+        all privileges
+on
+        \`$db_name\`.*
+to
+        "$db_user"
+identified
+by
+        "$db_password"
+;
 END
 }
 
@@ -50,7 +63,7 @@ do
         esac
 done
 
-read_config < <(wordpress-config-info "$1")
+eval "$(wordpress-config-info "$1" | json_to_shell)"
 shift
 
 [ "$db_name" ]