From 902537673d10ca803c4b4be72f4ebb2cb941a436 Mon Sep 17 00:00:00 2001 From: MS Date: Thu, 19 Nov 2020 17:21:29 +0100 Subject: avoid double-slashes --- bin/taler-config-tips | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/taler-config-tips b/bin/taler-config-tips index 3d59c05..f7fc01b 100755 --- a/bin/taler-config-tips +++ b/bin/taler-config-tips @@ -2,6 +2,10 @@ set -eu +function join_no_double_slash { + echo "$1$2" | sed -s 's/\([^:]\)\/\+/\1\//g' +} + BANK_URL=$(taler-config -s bank -o base_url) MERCHANT_URL=$(taler-config -s frontends -o backend) CURRENCY=$(taler-config -s taler -o currency) @@ -12,9 +16,9 @@ APIKEY=$(taler-config -s frontends -o backend_apikey) PAYTO_WITH_SUBJECT=$(taler-merchant-setup-reserve \ --amount="${CURRENCY}:20" \ --exchange-url=${EXCHANGE_URL} \ - --merchant-url="${MERCHANT_URL}/instances/survey/" \ + --merchant-url=$(join_no_double_slash ${MERCHANT_URL} "/instances/survey") \ --wire-method=${WIRE_METHOD} \ --apikey="ApiKey ${APIKEY}") echo "Merchant generated the following tip-reserve: $PAYTO_WITH_SUBJECT" taler-bank-manage django wire_transfer_payto Survey x ${PAYTO_WITH_SUBJECT} "${CURRENCY}:50" -echo Tip-reserve got paid. +echo Paid for tip reserve. -- cgit v1.2.3