From c05e83a1b28404b75860e786f6de5ab9ed409e4a Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <a.mayorov@rbkmoney.com>
Date: Tue, 16 Jul 2019 19:08:28 +0300
Subject: [PATCH] Unquote WOORL expansion to allow extra cli args (#60)

* Hack my way out of no-ws-in-filename problem
---
 scripts/create-manual-refund.sh         | 2 +-
 scripts/dominant/commit-base-fixture.sh | 2 +-
 scripts/dominant/create-account.sh      | 2 +-
 scripts/fail-machine.sh                 | 2 +-
 scripts/get-posting-plan-batch.sh       | 2 +-
 scripts/hellgate/get-invoice-events.sh  | 2 +-
 scripts/hellgate/get-invoice-state.sh   | 2 +-
 scripts/hellgate/get-party-events.sh    | 2 +-
 scripts/hellgate/get-party-state.sh     | 2 +-
 scripts/machinegun/repair-machine.sh    | 2 +-
 scripts/refund-invoice-payment.sh       | 2 +-
 scripts/repair-invoice.sh               | 2 +-
 scripts/rollback-posting-plan.sh        | 4 ++--
 scripts/submit-posting-plan.sh          | 4 ++--
 woorlrc.sample                          | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/create-manual-refund.sh b/scripts/create-manual-refund.sh
index 56c1fb9..64472ab 100755
--- a/scripts/create-manual-refund.sh
+++ b/scripts/create-manual-refund.sh
@@ -51,7 +51,7 @@ fi
 
 [ -f woorlrc ] && source woorlrc
 
-"${WOORL:-woorl}" \
+"${WOORL[@]:-woorl}" \
     -s "${DAMSEL}/proto/payment_processing.thrift" \
     "http://${HELLGATE:-hellgate}:8022/v1/processing/invoicing" \
     Invoicing CreateManualRefund "${USERINFO}" "\"${INVOICE_ID}\"" "\"${PAYMENT_ID}\"" "${PARAMS}"
diff --git a/scripts/dominant/commit-base-fixture.sh b/scripts/dominant/commit-base-fixture.sh
index 4d736cc..ee87a17 100755
--- a/scripts/dominant/commit-base-fixture.sh
+++ b/scripts/dominant/commit-base-fixture.sh
@@ -23,7 +23,7 @@ case "$1" in
         ;;
     * )
         FIXTURE=$("${LIBDIR}/template.sh" "${CURDIR}/base-fixture.commit.json.tpl" $*)
-        "${WOORL:-woorl}" $* \
+        "${WOORL[@]:-woorl}" $* \
             -s "${DAMSEL}/proto/domain_config.thrift" \
             "http://${DOMINANT:-dominant}:8022/v1/domain/repository" \
             Repository Commit 0 "${FIXTURE}"
diff --git a/scripts/dominant/create-account.sh b/scripts/dominant/create-account.sh
index 961f733..47f96f2 100755
--- a/scripts/dominant/create-account.sh
+++ b/scripts/dominant/create-account.sh
@@ -8,7 +8,7 @@ shift 1
 
 [ -z "${CURRENCY}" ] && { echo "No currency code specified"; exit -1; }
 
-"${WOORL:-woorl}" $* \
+"${WOORL[@]:-woorl}" $* \
     -s "${DAMSEL}/proto/accounter.thrift" \
     "http://${SHUMWAY:-shumway}:8022/accounter" \
     Accounter CreateAccount "{\"currency_sym_code\":\"${CURRENCY}\"}"
diff --git a/scripts/fail-machine.sh b/scripts/fail-machine.sh
index 238bbdc..dd4d60a 100755
--- a/scripts/fail-machine.sh
+++ b/scripts/fail-machine.sh
@@ -43,7 +43,7 @@ CALLARGS=$(cat <<END
 END
 )
 
-"${WOORL:-woorl}" -s "${MGPROTO}/proto/state_processing.thrift" \
+"${WOORL[@]:-woorl}" -s "${MGPROTO}/proto/state_processing.thrift" \
     "http://${MACHINEGUN:-machinegun}:8022/v1/automaton" \
     Automaton Call "${MACHINEDESC}" "${CALLARGS}" \
       | grep -sqF 'MachineFailed'
diff --git a/scripts/get-posting-plan-batch.sh b/scripts/get-posting-plan-batch.sh
index 2853940..c206f23 100755
--- a/scripts/get-posting-plan-batch.sh
+++ b/scripts/get-posting-plan-batch.sh
@@ -29,6 +29,6 @@ BATCHID="${2}"
 
 ACCOUNTER="http://${SHUMWAY:-shumway}:8022/accounter"
 
-"${WOORL:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
+"${WOORL[@]:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
     "${ACCOUNTER}" Accounter GetPlan "\"${PLANID}\"" | \
       jq ".batch_list[] | select(.id == ${BATCHID})"
diff --git a/scripts/hellgate/get-invoice-events.sh b/scripts/hellgate/get-invoice-events.sh
index 222dad5..8d1cf18 100755
--- a/scripts/hellgate/get-invoice-events.sh
+++ b/scripts/hellgate/get-invoice-events.sh
@@ -8,7 +8,7 @@ DAMSEL="${CWD}/../../damsel"
 SCRIPTNAME=$(basename $0)
 
 get_events () {
-    "${WOORL:-woorl}" \
+    "${WOORL[@]:-woorl}" \
         -s "${DAMSEL}/proto/payment_processing.thrift" \
         "http://${HELLGATE:-hellgate}:8022/v1/processing/invoicing" \
         Invoicing GetEvents "$1" "$2" "$3"
diff --git a/scripts/hellgate/get-invoice-state.sh b/scripts/hellgate/get-invoice-state.sh
index feca101..62895ad 100755
--- a/scripts/hellgate/get-invoice-state.sh
+++ b/scripts/hellgate/get-invoice-state.sh
@@ -8,7 +8,7 @@ DAMSEL="${CWD}/../../damsel"
 SCRIPTNAME=$(basename $0)
 
 get_state () {
-    "${WOORL:-woorl}" \
+    "${WOORL[@]:-woorl}" \
         -s "${DAMSEL}/proto/payment_processing.thrift" \
         "http://${HELLGATE:-hellgate}:8022/v1/processing/invoicing" \
         Invoicing Get "$1" "$2"
diff --git a/scripts/hellgate/get-party-events.sh b/scripts/hellgate/get-party-events.sh
index 2bd2bd2..d7b27cf 100755
--- a/scripts/hellgate/get-party-events.sh
+++ b/scripts/hellgate/get-party-events.sh
@@ -8,7 +8,7 @@ DAMSEL="${CWD}/../../damsel"
 SCRIPTNAME=$(basename $0)
 
 get_events () {
-    "${WOORL:-woorl}" $4 \
+    "${WOORL[@]:-woorl}" $4 \
         -s "${DAMSEL}/proto/payment_processing.thrift" \
         "http://${HELLGATE:-hellgate}:8022/v1/processing/partymgmt" \
         PartyManagement GetEvents "$1" "$2" "$3"
diff --git a/scripts/hellgate/get-party-state.sh b/scripts/hellgate/get-party-state.sh
index a3aaca2..e9c18de 100755
--- a/scripts/hellgate/get-party-state.sh
+++ b/scripts/hellgate/get-party-state.sh
@@ -8,7 +8,7 @@ DAMSEL="${CWD}/../../damsel"
 SCRIPTNAME=$(basename $0)
 
 get_party () {
-    "${WOORL:-woorl}" $3 \
+    "${WOORL[@]:-woorl}" $3 \
         -s "${DAMSEL}/proto/payment_processing.thrift" \
         "http://${HELLGATE:-hellgate}:8022/v1/processing/partymgmt" \
         PartyManagement Get "$1" "$2"
diff --git a/scripts/machinegun/repair-machine.sh b/scripts/machinegun/repair-machine.sh
index b48fbd2..a9a7a7b 100755
--- a/scripts/machinegun/repair-machine.sh
+++ b/scripts/machinegun/repair-machine.sh
@@ -9,7 +9,7 @@ MACHINE_NS="\"${1}\""
 MACHINE_ID="{\"id\":\"${2}\"}"
 shift 2
 
-"${WOORL:-woorl}" $* \
+"${WOORL[@]:-woorl}" $* \
     -s "${MGPROTO}/proto/state_processing.thrift" \
     "http://${MACHINEGUN:-machinegun}:8022/v1/automaton" \
     Automaton Repair "${MACHINE_NS}" "${MACHINE_ID}" \
diff --git a/scripts/refund-invoice-payment.sh b/scripts/refund-invoice-payment.sh
index fd7d194..0b6a58a 100755
--- a/scripts/refund-invoice-payment.sh
+++ b/scripts/refund-invoice-payment.sh
@@ -34,7 +34,7 @@ USERINFO=$(jq -nc "{id:\"${SCRIPTNAME}\", type:{service_user:{}}}")
 
 [ -f woorlrc ] && source woorlrc
 
-"${WOORL:-woorl}" \
+"${WOORL[@]:-woorl}" \
     -s "${DAMSEL}/proto/payment_processing.thrift" \
     "http://${HELLGATE:-hellgate}:8022/v1/processing/invoicing" \
     Invoicing RefundPayment "${USERINFO}" "\"${INVOICE}\"" "\"${PAYMENT}\"" "${PARAMS}"
diff --git a/scripts/repair-invoice.sh b/scripts/repair-invoice.sh
index 05fe15d..3afdbb4 100755
--- a/scripts/repair-invoice.sh
+++ b/scripts/repair-invoice.sh
@@ -55,7 +55,7 @@ INVOICE_CHANGES="${2}"
 
 USERINFO='{"id":"woorl","type":{"service_user":{}}}'
 
-"${WOORL:-woorl}" \
+"${WOORL[@]:-woorl}" \
     -s "${DAMSEL}/proto/payment_processing.thrift" \
     "http://${HELLGATE:-hellgate}:8022/v1/processing/invoicing" \
     Invoicing Repair "${USERINFO}" "\"${INVOICE}\"" "${INVOICE_CHANGES}" "${ACTION}" "${PARAMS}"
diff --git a/scripts/rollback-posting-plan.sh b/scripts/rollback-posting-plan.sh
index 70f17e5..df53dd0 100755
--- a/scripts/rollback-posting-plan.sh
+++ b/scripts/rollback-posting-plan.sh
@@ -30,9 +30,9 @@ BATCH="${2}"
 
 ACCOUNTER="http://${SHUMWAY:-shumway}:8022/accounter"
 
-"${WOORL:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
+"${WOORL[@]:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
     "${ACCOUNTER}" Accounter Hold \
     "{\"id\": \"${PLANID}\", \"batch\": ${BATCH}}" && \
-"${WOORL:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
+"${WOORL[@]:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
     "${ACCOUNTER}"  Accounter RollbackPlan \
     "{\"id\": \"${PLANID}\", \"batch_list\": [${BATCH}]}"
diff --git a/scripts/submit-posting-plan.sh b/scripts/submit-posting-plan.sh
index 1b1ff5b..17b68bd 100755
--- a/scripts/submit-posting-plan.sh
+++ b/scripts/submit-posting-plan.sh
@@ -30,9 +30,9 @@ BATCH="${2}"
 
 ACCOUNTER="http://${SHUMWAY:-shumway}:8022/accounter"
 
-"${WOORL:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
+"${WOORL[@]:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
     "${ACCOUNTER}" Accounter Hold \
     "{\"id\": \"${PLANID}\", \"batch\": ${BATCH}}" && \
-"${WOORL:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
+"${WOORL[@]:-woorl}" -s "${DAMSEL}/proto/accounter.thrift" \
     "${ACCOUNTER}"  Accounter CommitPlan \
     "{\"id\": \"${PLANID}\", \"batch_list\": [${BATCH}]}"
diff --git a/woorlrc.sample b/woorlrc.sample
index ecac8bc..07d6fe9 100644
--- a/woorlrc.sample
+++ b/woorlrc.sample
@@ -1 +1 @@
-WOORL="woorl -v --deadline 30s"
+WOORL=(woorl -v --deadline 30s)