From fb60953d3d1f3a3cd64a218cc3ae8c5a96843bb0 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Thu, 26 Mar 2020 19:10:56 +0100
Subject: [PATCH] FIX: Loading load_settings.sh
---
utils/helpers.sh | 2 +-
utils/patch_header.sh | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/utils/helpers.sh b/utils/helpers.sh
index bb2337d..4ecf878 100644
--- a/utils/helpers.sh
+++ b/utils/helpers.sh
@@ -33,7 +33,7 @@
function mysql_execute {
#TODO is it meaningful that here always the database user is used???
set +e
- env
+ # env | sort
$MYSQL_CMD $(get_db_args) -e "$1"
ret=${PIPESTATUS[0]}
if [ "$ret" -ne 0 ]; then
diff --git a/utils/patch_header.sh b/utils/patch_header.sh
index 7f85505..f53266a 100644
--- a/utils/patch_header.sh
+++ b/utils/patch_header.sh
@@ -24,7 +24,8 @@
#header for patch scripts
# load useful functions #######################################################
-. $UTILSPATH/helpers.sh
+source $UTILSPATH/load_settings.sh
+source $UTILSPATH/helpers.sh
USAGE="$1 [ --env=ENV_FILE ] [ --patch=PATCH ] [ --backupdir=BACKUPDIR ]\n\n"
CMD_OPTIONS=$(cat <<EOF
--
GitLab