MAINT: moved helper scripts to utils folder

patches/utils/patch_header.sh

@@ -23,8 +23,8 @@
 #
 #header for patch scripts
 
-. ../../load_settings.sh
-. ../../utils.sh
+. ../../utils/load_settings.sh
+. ../../utils/helpers.sh
 
 USAGE="$1 [ --env=ENV_FILE ] [ --patch=PATCH ] [ --backupdir=BACKUPDIR ]\n\n"
 CMD_OPTIONS=$(cat <<EOF

utils/backup.sh

@@ -58,12 +58,11 @@ backup:
 EOF
         )
 
-# Config and command line parameter loading ###################################
+# Load settings from .config and defaults #####################################
+. ../load_settings.sh
 
-. ../.config
-
-# load useful stuff - parses the commandline parameters and so on...
-. ../patches/utils/patch_header.sh
+# load useful functions #######################################################
+. helpers.sh
 
 function backup() {
     NARG_NAME="$1"
@@ -75,7 +74,7 @@ function backup() {
 		    failure "dumpfile already exists."
 	  fi
     echo "Dumping database $NARG_NAME to $NARG_FILE ... "
-	  $CMD_MYSQL_DUMP $MYSQL_CONNECTION_NO_DB $* --opt --default-character-set=utf8 --routines \
+	  $MYSQLDUMP_CMD $MYSQL_CONNECTION_NO_DB $* --opt --default-character-set=utf8 --routines \
                     "$NARG_NAME" > "$NARG_FILE"
 
     if [[ "$YAML" == "true" ]] ; then

load_settings.sh → utils/load_settings.sh

@@ -18,8 +18,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-[[ -n "config.defaults" ]] && source "config.defaults"
-[[ -n ".config" ]] && source ".config"
+[[ -n "../config.defaults" ]] && source "../config.defaults"
+[[ -n "../.config" ]] && source "../.config"
 [[ -n "$ENV_FILE" ]] && source "$ENV_FILE"
 
 if [[ -z "$DATABASE_NAME" && -z "$MYSQL_CONNECTION" ]]