diff --git a/make_db b/make_db index 63a5060533d4c48f76d83e3396cc41a381e44cbb..96571f71acbfb92d427a5377e62adc455cb4ca27 100755 --- a/make_db +++ b/make_db @@ -24,8 +24,20 @@ # To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105 -source utils/load_settings.sh +source .config || true + +if [ -z $LOGIN_PATH ] ; then + MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT} + --user=${MYSQL_USER} + --password=${MYSQL_USER_PASSWORD}" +else + MYSQL_CONNECTION="--login-path=$LOGIN_PATH" +fi + +INSTALL_SQL_FILE="db_2_0.sql" + +SQL="$MYSQL_CMD $MYSQL_CONNECTION" set -e function fail() { @@ -144,8 +156,6 @@ function restore_db() { } function test-connection() { - echo "halllooooo" - echo $SQL $SQL -e "select 0;" } @@ -209,11 +219,6 @@ function _db_exists() { && return 0 || return 1 } -source .config || true - -INSTALL_SQL_FILE="db_2_0.sql" - -SQL="$MYSQL_CMD $MYSQL_CONNECTION" case $1 in "drop") drop $2 ;;