From 2b8e0c7ccb7c7772e2bed0bf1ff0f27f27ddae52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 24 Mar 2020 12:37:42 +0100
Subject: [PATCH] MAINT: load settings in make_db
---
make_db | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/make_db b/make_db
index ccf3cd4..dee06fe 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"
--
GitLab