From cac5b2ca615653a404da7ae2212194581b81574a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 11 Aug 2023 20:43:13 +0200
Subject: allow -h without root

---
 contrib/taler-exchange-dbconfig | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'contrib/taler-exchange-dbconfig')

diff --git a/contrib/taler-exchange-dbconfig b/contrib/taler-exchange-dbconfig
index efa4247e9..4be0fef7d 100755
--- a/contrib/taler-exchange-dbconfig
+++ b/contrib/taler-exchange-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-exchange-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-exchange-dbinit -v 2> /dev/null
-- 
cgit v1.2.3