diff --git a/makefile b/makefile index 1a1fb17229554ecc1d81a4823dbbee9922c8942e..437160876e7226a5e4e199d1641d2b90a93ef6f0 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 6407567fb7b270252a2860821272297044240c8f..8403fd7d7e9a60ee5dda5f1ed996f77ccd6cf6ad 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