[taler-merchant] branch master updated: allow -h without root

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 525426db allow -h without root
525426db is described below

commit 525426db10c179fcacd19487f6c22cac837b2d40
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Aug 11 20:43:05 2023 +0200

    allow -h without root
---
 contrib/taler-merchant-dbconfig | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/contrib/taler-merchant-dbconfig b/contrib/taler-merchant-dbconfig
index 18318d85..fbb25ced 100755
--- a/contrib/taler-merchant-dbconfig
+++ b/contrib/taler-merchant-dbconfig
@@ -19,18 +19,6 @@
 # Error checking on
 set -eu
 
-if ! id postgres > /dev/null
-then
-    echo "Could not find 'postgres' user. Please install Postgresql first"
-    exit 1
-fi
-
-if [ "$(id -u)" -ne 0 ]
-then
-    echo "This script must be run as root"
-    exit 1
-fi
-
 RESET_DB=0
 SKIP_DBINIT=0
 DBUSER="taler-merchant-httpd"
@@ -67,6 +55,18 @@ while getopts ':hn:rsu:' OPTION; do
     esac
 done
 
+if ! id postgres > /dev/null
+then
+    echo "Could not find 'postgres' user. Please install Postgresql first"
+    exit 1
+fi
+
+if [ "$(id -u)" -ne 0 ]
+then
+    echo "This script must be run as root"
+    exit 1
+fi
+
 if [ 0 = "$SKIP_DBINIT" ]
 then
     if ! taler-merchant-dbinit -v 2> /dev/null

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.