From eaf06fc60e5ed45024818dce8eb68e0de068ae45 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Tue, 12 Feb 2019 17:49:22 +0100
Subject: [PATCH] WIP: Fixing make_db
---
make_db | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
mode change 100644 => 100755 make_db
diff --git a/make_db b/make_db
old mode 100644
new mode 100755
index 34f1468..4eded5e
--- a/make_db
+++ b/make_db
@@ -109,16 +109,16 @@ function _db_exists() {
. .config
INSTALL_SQL_FILE="db_2_0.sql"
-if [ -n $LOGIN_PATH ] ; then
- MYSQL_CONNECTION="--login-path=$LOGIN_PATH"
+if [ -z $LOGIN_PATH ] ; then
+ MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT}
+ --user=${MYSQL_USER}
+ --password=${MYSQL_USER_PASSWORD}"
else
- MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT} "\
- "--user=${MYSQL_USER} "\
- "--password=${MYSQL_USER_PASSWORD}"
+ MYSQL_CONNECTION="--login-path=$LOGIN_PATH"
fi
-SQL="$MYSQL_CMD" $MYSQL_CONNECTION
-
+SQL=$MYSQL_CMD $MYSQL_CONNECTION
+
case $1 in
"drop") drop $2 ;;
"grant") grant ;;
--
GitLab