Skip to content
Snippets Groups Projects
Unverified Commit 027877a4 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

FIX password problems

parent e5e04d8b
No related branches found
No related tags found
No related merge requests found
......@@ -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; \
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment