From f84e6d98eaabfb4fa42004734161b1c261618994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Mon, 23 Mar 2020 20:10:10 +0100
Subject: [PATCH] MAINT: there were MYSQLDUMP_CMD and CMD_MYSQL_DUMP; remove
one
---
backup.sh | 2 +-
patches/utils/patch_header.sh | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/backup.sh b/backup.sh
index f8fee2e..bbfa53d 100755
--- a/backup.sh
+++ b/backup.sh
@@ -46,7 +46,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 $NARG_NAME > $NARG_FILE
+ $MYSQLDUMP_CMD $MYSQL_CONNECTION_NO_DB $* --opt --default-character-set=utf8 --routines $NARG_NAME > $NARG_FILE
success
}
diff --git a/patches/utils/patch_header.sh b/patches/utils/patch_header.sh
index 0a425b8..c742a1f 100644
--- a/patches/utils/patch_header.sh
+++ b/patches/utils/patch_header.sh
@@ -22,7 +22,6 @@
# ** end header
#
#header for patch scripts
-CMD_MYSQL_DUMP=mysqldump
USAGE="$1 [ --env=ENV_FILE ] [ --patch=PATCH ] [ --backupdir=BACKUPDIR ]\n\n"
CMD_OPTIONS=cat <<EOF
options:
@@ -160,7 +159,7 @@ function update_version {
}
function dump_table {
- $CMD_MYSQL_DUMP $MYSQL_CONNECTION_NO_DB $DATABASE_NAME $1 \
+ $MYSQLDUMP_CMD $MYSQL_CONNECTION_NO_DB $DATABASE_NAME $1 \
> ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
}
--
GitLab