diff --git a/make_db b/make_db index ccf3cd4c3c34fc12e86584613d1bda039c7c7f95..dee06fe57f5b11bfaaaf473452fc758d18f544b3 100755 --- a/make_db +++ b/make_db @@ -25,6 +25,8 @@ # To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105 set -e +source utils/load_settings.sh + function fail() { echo "Some error occured, exiting." exit 1 @@ -207,13 +209,6 @@ function _db_exists() { source .config || true INSTALL_SQL_FILE="db_2_0.sql" -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 SQL="$MYSQL_CMD $MYSQL_CONNECTION"