From 93d6d9170857ee9913261673ca969a441781c05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Sat, 28 Mar 2020 17:28:58 +0100
Subject: [PATCH] MAINT: disable configure; some fixes

---
 configure               | 17 ++++++++++++-----
 patches/applyPatches.sh |  3 ---
 utils/backup.sh         | 21 +++------------------
 utils/load_settings.sh  |  2 +-
 utils/log.sh            |  8 ++++----
 utils/make_db           |  1 -
 6 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/configure b/configure
index 9c6e754..fa76621 100755
--- a/configure
+++ b/configure
@@ -22,14 +22,21 @@
 # ** end header
 #
 
+echo "CURRENTLY NOT SUPPORTET"
+exit 1
+
+if [ -z "$UTILSPATH" ]; then
+    UTILSPATH="$(realpath $(dirname $0)/utils)"
+    export UTILSPATH
+fi
 
 # defaults
 source config.defaults
 OPTIONS=$(sed -r '/^(#|\s*$)/d' config.defaults | sed -r 's/=.*$//g')
 
 # override with old config
-if [ -e .config ]; then
-    source .config
+if [ -e $MAINPATH/.config ]; then
+    source $MAINPATH/.config
 fi
 
 # DEBUG - print all options:
@@ -77,12 +84,12 @@ fi
 # DEBUG - print all options:
 # for opt in $OPTIONS; do echo $opt = ${!opt}; done
 
-# write to .config
-rm -f .config
+# write to $MAINPATH/.config
+rm -f $MAINPATH/.config
 for opt in $OPTIONS; do
     esc_hash=${!opt//#/\\\#}
     esc_dollar=${esc_hash//\$/'$$'}
     esc_dq=${esc_dollar//\"/\\\"}
     esc_sq=${esc_dq//\'/\\\'}
-    echo "$opt=\"$esc_sq\"" >> .config
+    echo "$opt=\"$esc_sq\"" >> $MAINPATH/.config
 done
diff --git a/patches/applyPatches.sh b/patches/applyPatches.sh
index 46369e4..735dd3e 100755
--- a/patches/applyPatches.sh
+++ b/patches/applyPatches.sh
@@ -43,9 +43,6 @@ PATCHES="./patch*/patch.sh"
 
 for p in $PATCHES
 do
-    echo "$p"
-    env | grep MYSQL | sort
-    export | grep MYSQL | sort
     $p "$@" --patch=$p
 done
 
diff --git a/utils/backup.sh b/utils/backup.sh
index 29422d8..4fc133c 100755
--- a/utils/backup.sh
+++ b/utils/backup.sh
@@ -27,8 +27,8 @@
 # Dump a database with all procedures, permissions, structure and data
 
 if [ -z "$UTILSPATH" ]; then
-	UTILSPATH="$(realpath $(dirname $0))"
-	export UTILSPATH
+    UTILSPATH="$(realpath $(dirname $0))"
+    export UTILSPATH
 fi
 
 # The directory which the dump is to be stored to. Do not change it here. Use
@@ -45,30 +45,15 @@ function backup() {
     database="$1"
     backupdir="$2"
 
-<<<<<<< HEAD
     # Assert backup dir
     mkdir -p "$backupdir"
+
     datastring=$(date -u --rfc-3339=ns | sed 's/ /T/g')
     backupfile=${BACKUPDIR}/${DATABASE_NAME}.${datastring}.dump.sql
-=======
-    shift 2
-    # parameters: connection, database, outfile
-    if [ -e "$NARG_FILE" ]; then
-        failure "dumpfile already exists."
-    fi
-    echo "Dumping database $NARG_NAME to $NARG_FILE ... "
-  $MYSQLDUMP_CMD $(get_mysql_args_nodb) $* --opt --default-character-set=utf8 --routines \
-                    "$NARG_NAME" > "$NARG_FILE"
->>>>>>> s-clean-up-stage
 
     if [ -e "$backupfile" ]; then
         failure "dumpfile already exists."
     fi
-<<<<<<< HEAD
-=======
-    success
-}
->>>>>>> s-clean-up-stage
 
     echo "Dumping database $database to $backupfile ... "
     $MYSQLDUMP_CMD $(get_mysql_args_nodb) --opt --default-character-set=utf8\
diff --git a/utils/load_settings.sh b/utils/load_settings.sh
index 73d6336..39cc7b2 100644
--- a/utils/load_settings.sh
+++ b/utils/load_settings.sh
@@ -34,7 +34,7 @@ if [ -z "$MAINPATH" ]; then
 fi
 
 # Make a backup of the important environment variables.
-my_env=$(export -p | grep -E '(MYSQL|DATABASE)')
+my_env=$(export -p | grep -E '(MYSQL|DATABASE)' || true)
 
 source "$MAINPATH/config.defaults"
 
diff --git a/utils/log.sh b/utils/log.sh
index 34f84a1..ad8d508 100755
--- a/utils/log.sh
+++ b/utils/log.sh
@@ -37,15 +37,15 @@ fi
 # load useful functions #######################################################
 . $UTILSPATH/helpers.sh
 
-function get_logs { 
+function get_logs {
     echo 'select event_time, argument from mysql.general_log where command_type="Query";' | \
-		$MYSQL_CMD $(get_db_args_nodb) --batch 
+		$MYSQL_CMD $(get_db_args_nodb) --batch
 }
 
-function set_logging { 
+function set_logging {
     echo "Setting logging $1..."
     echo "SET GLOBAL log_output = 'TABLE'; SET GLOBAL general_log = '$1';" | \
-        $MYSQL_CMD $(get_db_args_nodb) --batch 
+        $MYSQL_CMD $(get_db_args_nodb) --batch
 	success
 }
 
diff --git a/utils/make_db b/utils/make_db
index 323a116..6af1a36 100755
--- a/utils/make_db
+++ b/utils/make_db
@@ -127,7 +127,6 @@ function restore_db() {
 }
 
 function test-connection() {
-    echo $MYSQL_CMD $(get_mysql_args_nodb) -e "select 0;"
     $MYSQL_CMD $(get_mysql_args_nodb) -e "select 0;"
 }
 
-- 
GitLab