From 33e0f1791d1b5047e9c07222be6486441aca9def Mon Sep 17 00:00:00 2001
From: MS <ms@taler.net>
Date: Tue, 1 Nov 2022 20:42:00 +0100
Subject: use appropriate credentials options

---
 docker/hybrid/images/merchant/startup.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh
index 9d74d50..8732891 100644
--- a/docker/hybrid/images/merchant/startup.sh
+++ b/docker/hybrid/images/merchant/startup.sh
@@ -42,7 +42,7 @@ socat TCP-LISTEN:5555,fork,reuseaddr TCP:exchange:80 &
 # to make frontends reach the backend.
 socat TCP-LISTEN:5556,fork,reuseaddr TCP:localhost:80 &
 
-# $2 might have Authorization header.
+# $2/$3 might have credentials
 is_serving () {
 set +u # tolerate missing $2
 echo Checking $1
@@ -52,7 +52,7 @@ for n in `seq 1 50`
     sleep 0.5
     OK=1
     # auth case.
-    if test -n "$2"; then
+    if test -n "$2" -a -n "$3"; then
       wget --header "$2" $1 -o /dev/null -O /dev/null >/dev/null && break
     else
       wget $1 -o /dev/null -O /dev/null >/dev/null && break
@@ -124,8 +124,7 @@ is_serving "${SANDBOX_URL}/integration-api/config"
 SURVEY_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o survey-sandbox-username`
 SURVEY_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o survey-sandbox-password`
 # Check/wait that the Survey site got its bank account.
-is_serving "${SANDBOX_URL}/access-api/accounts/${SURVEY_USERNAME}" \
-  "Authorization: Basic $(echo $SURVEY_USERNAME:$SURVEY_PASSWORD | base64)"
+is_serving "${SANDBOX_URL}/access-api/accounts/${SURVEY_USERNAME}" $SURVEY_USERNAME $SURVEY_PASSWORD
 export LIBEUFIN_SANDBOX_USERNAME=${SURVEY_USERNAME}
 export LIBEUFIN_SANDBOX_PASSWORD=${SURVEY_PASSWORD}
 libeufin-cli sandbox \
-- 
cgit v1.2.3