merchant

commit 8c209a0c22aff2132715d10ee75ef592c7f91a95
parent 2f8ea95eb33a1b9451005b4e4108dd7263d06a77
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Tue,  5 Dec 2023 22:34:02 +0900

improve taler-merchant-dbconfig: more error handling

Diffstat:
M
contrib/taler-merchant-dbconfig
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/taler-merchant-dbconfig b/contrib/taler-merchant-dbconfig
@@ -70,7 +70,9 @@ then
     if ! taler-merchant-dbinit -v 2> /dev/null
     then
         echo "Required 'taler-merchant-dbinit' not found. Please fix your installation."
+        exit 1
     fi
+    DBINIT=$(which taler-merchant-dbinit)
 fi
 
 if ! id "$DBUSER" > /dev/null
@@ -134,7 +136,7 @@ fi
 if [ 0 = "$SKIP_DBINIT" ]
 then
     echo "Initializing database $DBNAME." 1>&2
-    if ! sudo -u "$DBUSER" taler-merchant-dbinit -c "$CFGFILE"
+    if ! sudo -u "$DBUSER" "$DBINIT" -c "$CFGFILE"
     then
         echo "Failed to initialize database schema"
         exit 1