fix dbconfig commands

1 files changed, 4 insertions, 2 deletions

diff --git a/contrib/taler-merchant-dbconfig b/contrib/taler-merchant-dbconfig
index db9e38c4..4707fe40 100755
--- a/contrib/taler-merchant-dbconfig
+++ b/contrib/taler-merchant-dbconfig
@@ -22,7 +22,7 @@ set -eu
 RESET_DB=0
 SKIP_DBINIT=0
 DBUSER="taler-merchant-httpd"
-CFGFILE="/etc/taler/taler.conf"
+CFGFILE="/etc/taler-merchant/taler-merchant.conf"
 
 # Parse command-line options
 while getopts 'c:hrsu:' OPTION; do
@@ -33,6 +33,7 @@ while getopts 'c:hrsu:' OPTION; do
         h)
             echo 'Supported options:'
             echo "  -c FILENAME  -- use configuration FILENAME (default: $CFGFILE)"
+            echo "  -h           -- print this help text"
             echo "  -r           -- reset database (dangerous)"
             echo "  -s           -- skip database initialization"
             echo "  -u USER      -- taler-merchant to be run by USER (default: $DBUSER)"
@@ -48,7 +49,8 @@ while getopts 'c:hrsu:' OPTION; do
             DBUSER="$OPTARG"
             ;;
         ?)
-        exit_fail "Unrecognized command line option"
+        echo "Unrecognized command line option '$OPTION'" 1&>2
+        exit 1
         ;;
     esac
 done