Skip to content
Snippets Groups Projects
Commit 2b8e0c7c authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

MAINT: load settings in make_db

parent bf8c6828
No related branches found
No related tags found
No related merge requests found
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
# To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105 # To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105
set -e set -e
source utils/load_settings.sh
function fail() { function fail() {
echo "Some error occured, exiting." echo "Some error occured, exiting."
exit 1 exit 1
...@@ -207,13 +209,6 @@ function _db_exists() { ...@@ -207,13 +209,6 @@ function _db_exists() {
source .config || true source .config || true
INSTALL_SQL_FILE="db_2_0.sql" 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" SQL="$MYSQL_CMD $MYSQL_CONNECTION"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment