From 027877a4cb825e5cc794a8b40645e3149eaa6726 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Mon, 19 Nov 2018 16:58:51 +0100
Subject: [PATCH] FIX password problems
---
makefile | 1 -
patches/utils/patch_header.sh | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/makefile b/makefile
index 1a1fb17..4371608 100644
--- a/makefile
+++ b/makefile
@@ -44,7 +44,6 @@ install: _install _grant upgrade
.PHONY: _install
_install:
- @echo $(MYSQL_CONNECTION)
@if $(MAKE) _exists > /dev/null 2>&1; then \
printf "\n\nA database with with the name \"$(DATABASE_NAME)\" does already exist.\nCall 'make drop-$(DATABASE_NAME)' to delete that database or reconfigure with './configure'.\n"; \
exit 1; \
diff --git a/patches/utils/patch_header.sh b/patches/utils/patch_header.sh
index 6407567..8403fd7 100644
--- a/patches/utils/patch_header.sh
+++ b/patches/utils/patch_header.sh
@@ -60,7 +60,7 @@ while test $# -gt 0; do
-u)
shift
if test $# -gt 0; then
- DATABASE_USER=$1
+ MYSQL_USER=$1
else
echo "no database specified"
exit 1
@@ -68,7 +68,7 @@ while test $# -gt 0; do
shift
;;
--user*)
- DATABASE_USER=`echo $1 | sed -e 's/^[^=]*=//g'`
+ MYSQL_USER=`echo $1 | sed -e 's/^[^=]*=//g'`
shift
;;
-l)
@@ -124,13 +124,13 @@ then
MYSQL_CONNECTION="--login-path=$LOGIN_PATH"
else
MYSQL_CONNECTION=""
- if [ "$DATABASE_USER" ]
+ if [ "$MYSQL_USER" ]
then
- MYSQL_CONNECTION="--user=$DATABASE_USER"
+ MYSQL_CONNECTION="--user=$MYSQL_USER"
fi
- if [ "$DATABASE_USER_PASSWORD" ]
+ if [ "$MYSQL_USER_PASSWORD" ]
then
- MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$DATABASE_USER_PASSWORD"
+ MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$MYSQL_USER_PASSWORD"
fi
fi
--
GitLab