taldir

commit 169eb8ab5951e1a006becf2fcdc019ae9c6e7c70
parent bc9c4dfdc65f42115de6540cbae5c713efecec02
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Sun, 15 Feb 2026 08:36:03 +0100

fix db setup routing for new connection string

Diffstat:
M
contrib/taler-directory-dbconfig
 | 
16
++++++++++++----

1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/contrib/taler-directory-dbconfig b/contrib/taler-directory-dbconfig
@@ -85,14 +85,22 @@ if ! sudo -i -u postgres createuser "$DBUSER" 2>/dev/null; then
   echo "Database user '$DBUSER' already existed. Continuing anyway." 1>&2
 fi
 
-DBNAME_CFG_ENTRY=$(taler-directory-config \
+DBPATH=$(taler-directory-config \
   -c "$CFGFILE" \
   -s taldir-pq \
-  -o db_name)
+  -o connection_string)
 
-DBNAME=$(echo $DBNAME_CFG_ENTRY | cut -d'=' -f2 | xargs)
+if ! echo "$DBPATH" | grep "postgres://" >/dev/null; then
+  echo "Invalid database configuration value '$DBPATH'." 1>&2
+  exit 1
+fi
+
+DBNAME_KEYVAL=$(echo "$DBPATH" |
+  sed \
+    -e "s/postgres:\/\/.*\///" \
+    -e "s/?.*//")
 
-echo $DBNAME
+DBNAME=$(echo $DBNAME_KEYVAL | cut -d'=' -f2 | xargs)
 
 if sudo -i -u postgres psql "$DBNAME" </dev/null 2>/dev/null; then
   if [ 1 = "$RESET_DB" ]; then