Unquote WOORL expansion to allow extra cli args (#60)

* Hack my way out of no-ws-in-filename problem

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}"

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}"

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}\"}"

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'

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})"

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"

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"

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"

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"

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}" \

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}"

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}"

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}]}"

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}]}"

woorlrc.sample

@@ -1 +1 @@
-WOORL="woorl -v --deadline 30s"
+WOORL=(woorl -v --deadline 30s)