[taler-deployment] branch master updated: make arg optional

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new e0a4c47  make arg optional
e0a4c47 is described below

commit e0a4c47c85ad3318ce7f7580e97e3c431582e6d5
Author: MS <ms@taler.net>
AuthorDate: Tue Nov 1 19:38:44 2022 +0100

    make arg optional
---
 docker/hybrid/images/merchant/startup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/hybrid/images/merchant/startup.sh 
b/docker/hybrid/images/merchant/startup.sh
index 16a841e..22cc789 100644
--- a/docker/hybrid/images/merchant/startup.sh
+++ b/docker/hybrid/images/merchant/startup.sh
@@ -43,6 +43,7 @@ socat TCP-LISTEN:5555,fork,reuseaddr TCP:exchange:80 &
 socat TCP-LISTEN:5556,fork,reuseaddr TCP:localhost:80 &
 
 is_serving () {
+set +u # tolerate missing $2
 echo Checking $1
 HEADER_OPT=""
 # --header only used for auth
@@ -62,6 +63,7 @@ for n in `seq 1 50`
       echo "ERROR: $1 unreachable."
       exit 1
   fi
+  set -e
 }
 
 is_serving ${EXCHANGE_URL}

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.