exchange

commit cac5b2ca615653a404da7ae2212194581b81574a
parent 1b37347422f00edb648dfa78cd83083a2f80a9e8
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 11 Aug 2023 20:43:13 +0200

allow -h without root

Diffstat:
M
contrib/taler-auditor-dbconfig
 | 
24
++++++++++++------------
M
contrib/taler-exchange-dbconfig
 | 
24
++++++++++++------------

2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/contrib/taler-auditor-dbconfig b/contrib/taler-auditor-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-auditor-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-auditor-dbinit -v 2> /dev/null
diff --git 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