diff --git a/make_db b/make_db old mode 100644 new mode 100755 index 34f1468fb3396a4caf85a7c69217f1f7f892598d..4eded5eeb0a0e6460446cacd6a4bc056264d6787 --- 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 ;;