exchange

commit 5398fc060e8f617c07f5f42b1f51abf327a5ce2c
parent 9c8bf277997257ff527bc10190aeb2d3fee94b23
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  8 Dec 2024 23:08:07 +0100

process -r option even if we do not start the merchant, one of the merchant tests needs this

Diffstat:
M
src/testing/taler-unified-setup.sh
 | 
25
+++++++++++++------------

1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh
@@ -589,21 +589,22 @@ fi
 
 STAGE="merchant"
 
-if [ "1" = "$START_MERCHANT" ]
+if [ -n "${USE_MERCHANT_EXCHANGE+x}" ]
 then
-    echo -n "Starting merchant ..."
-    if [ -n "${USE_MERCHANT_EXCHANGE+x}" ]
+    MEPUB=$(taler-merchant-config -c "$CONF" -s "${USE_MERCHANT_EXCHANGE}" -o MASTER_KEY)
+    MXPUB=${MASTER_PUB:-$(taler-exchange-config -c "$CONF" -s exchange -o MASTER_PUBLIC_KEY)}
+    if [ "$MEPUB" != "$MXPUB" ]
     then
-        MEPUB=$(taler-merchant-config -c "$CONF" -s "${USE_MERCHANT_EXCHANGE}" -o MASTER_KEY)
-        MXPUB=${MASTER_PUB:-$(taler-exchange-config -c "$CONF" -s exchange -o MASTER_PUBLIC_KEY)}
-        if [ "$MEPUB" != "$MXPUB" ]
-        then
-            echo -n " patching master_pub ($MXPUB)..."
-            taler-merchant-config -c "$CONF" -s "${USE_MERCHANT_EXCHANGE}" -o MASTER_KEY -V "$MXPUB"
-        else
-            echo -n " with exchange $MXPUB ..."
-        fi
+        echo -n " patching master_pub ($MXPUB)..."
+        taler-merchant-config -c "$CONF" -s "${USE_MERCHANT_EXCHANGE}" -o MASTER_KEY -V "$MXPUB"
+    else
+        echo -n " with exchange $MXPUB ..."
     fi
+fi
+
+if [ "1" = "$START_MERCHANT" ]
+then
+    echo -n "Starting merchant ..."
     MERCHANT_TYPE=$(taler-merchant-config -c "$CONF" -s MERCHANT -o SERVE)
     if [ "unix" = "$MERCHANT_TYPE" ]
     then