From f5c8457642fd7a904c45608e60bf1945f66813e0 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Fri, 27 Mar 2020 14:39:03 +0100
Subject: [PATCH] FIX: Existing environment variables have higher priority than
 config

---
 utils/load_settings.sh | 6 ++++++
 utils/make_db          | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/utils/load_settings.sh b/utils/load_settings.sh
index 5cacc0d..73d6336 100644
--- a/utils/load_settings.sh
+++ b/utils/load_settings.sh
@@ -33,6 +33,9 @@ if [ -z "$MAINPATH" ]; then
     export MAINPATH
 fi
 
+# Make a backup of the important environment variables.
+my_env=$(export -p | grep -E '(MYSQL|DATABASE)')
+
 source "$MAINPATH/config.defaults"
 
 if [[ -r "$MAINPATH/.config" ]] ; then
@@ -47,6 +50,9 @@ if [[ -z "$MYSQL_CMD" ]] ; then
     exit 1
 fi
 
+# Restore backup.
+eval "$my_env"
+
 export MYSQL_CMD
 export MYSQLDUMP_CMD
 export MYSQLADMIN_CMD
diff --git a/utils/make_db b/utils/make_db
index b706438..6af1a36 100755
--- a/utils/make_db
+++ b/utils/make_db
@@ -97,7 +97,7 @@ function _setup_mytap() {
         echo MyTAB framework is already installed [OK]
         return 0
     fi
-    echo -n "Installing MyTAB framework ... "
+    echo -n "Installing MyTAP framework ... "
     pushd libs > /dev/null
     unzip -u mytap*.zip > /dev/null
     pushd mytap*/ > /dev/null
@@ -105,7 +105,7 @@ function _setup_mytap() {
     popd > /dev/null
     rm -r mytap*/
     popd > /dev/null
-    echo [DONE]
+    echo "[DONE]"
 }
 
 function install_db() {
-- 
GitLab