FIX: Load definitions first.

utils/helpers.sh

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2018 Research Group Biomedical Physics,
 # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
-# Copyright 2019 Daniel Hornung
+# Copyright 2019, 2020 Daniel Hornung
 # Copyright 2020 Henrik tom Wörden, IndiScale GmbH
 #
 # This program is free software: you can redistribute it and/or modify
@@ -19,16 +19,26 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 
+
+###############################################################################
+#                         Helper function definitions                         #
+###############################################################################
+
+# When sourcing this file, the following variables must be set:
+#
+# MYSQL_CMD : source $UTILSPATH/load_settings.sh
+
+
+
 function mysql_execute {
 	  #TODO is it meaningful that here always the database user is used???
 	  set +e
-    env
-	$MYSQL_CMD $(get_db_args) -e "$1"
-	ret=${PIPESTATUS[0]}
-	if [ "$ret" -ne 0 ]; then
-		failure "MYSQL ERROR"
-	fi
-	set -e
+	  $MYSQL_CMD $(get_db_args) -e "$1"
+	  ret=${PIPESTATUS[0]}
+	  if [ "$ret" -ne 0 ]; then
+		    failure "MYSQL ERROR"
+	  fi
+	  set -e
 }
 
 function get_mysql_args {

utils/update_sql_procedures.sh

@@ -24,7 +24,13 @@
 
 # Updates all SQL procedures
 
+if [ -z "$UTILSPATH" ]; then
+    UTILSPATH=$(realpath "$(dirname $0)")
+    export UTILSPATH
+fi
+
 source $UTILSPATH/helpers.sh
+source $UTILSPATH/load_settings.sh
 
 echo -n "updating rules ... "
 set -e