From 2f80b05d22a22c15b30350041f42cff0fd65e041 Mon Sep 17 00:00:00 2001
From: keblek <68111648+keblek@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:19:40 +0100
Subject: [PATCH] Added -r option to jq to strip quotes

The manual way for stripping quotes from a json reply is messy and gets in the way, jq has a built in tool `-r` to do this.

Aligned the echo commands so its a bit more tidy
---
 code/docker/setup-channels.sh | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/code/docker/setup-channels.sh b/code/docker/setup-channels.sh
index a26bc85..207246e 100644
--- a/code/docker/setup-channels.sh
+++ b/code/docker/setup-channels.sh
@@ -1,29 +1,15 @@
 #!/bin/bash
 
 echo Getting node IDs
-alice_address=$(docker-compose exec -T Alice bash -c "lncli -n regtest getinfo | jq .identity_pubkey")
-bob_address=$(docker-compose exec -T Bob bash -c "lightning-cli getinfo | jq .id")
-wei_address=$(docker-compose exec -T Wei bash -c "eclair-cli -s -j -p eclair getinfo| jq .nodeId")
-gloria_address=$(docker-compose exec -T Gloria bash -c "lncli -n regtest getinfo | jq .identity_pubkey")
-
-# The jq command returns JSON strings enclosed in double-quote characters
-# These will confuse the shell later, because double-quotes have special
-# meaning in a bash script.
-
-# We remove the double-quote character by using the shell string manipulation
-# expression: // removes the " character. Even here, we have to escape the "
-# character with a backslash because otherwise bash will interpret it as a
-# string closure.
-# A bit messy, but it works!
-alice_address=${alice_address//\"}
-bob_address=${bob_address//\"}
-wei_address=${wei_address//\"}
-gloria_address=${gloria_address//\"}
+alice_address=$(docker-compose exec -T Alice bash -c "lncli -n regtest getinfo | jq -r .identity_pubkey")
+bob_address=$(docker-compose exec -T Bob bash -c "lightning-cli getinfo | jq -r .id")
+wei_address=$(docker-compose exec -T Wei bash -c "eclair-cli -s -j -p eclair getinfo| jq -r .nodeId")
+gloria_address=$(docker-compose exec -T Gloria bash -c "lncli -n regtest getinfo | jq -r .identity_pubkey")
 
 # Let's tell everyone what we found!
-echo Alice: ${alice_address}
-echo Bob: ${bob_address}
-echo Wei: ${wei_address}
+echo Alice:  ${alice_address}
+echo Bob:    ${bob_address}
+echo Wei:    ${wei_address}
 echo Gloria: ${gloria_address}
 
 echo Setting up channels...
@@ -40,10 +26,8 @@ docker-compose exec -T Wei eclair-cli -p eclair connect --uri=${gloria_address}@
 docker-compose exec -T Wei eclair-cli -p eclair open --nodeId=${gloria_address} --fundingSatoshis=1000000
 
 echo Get 10k sats invoice from Gloria
-gloria_invoice=$(docker-compose exec -T Gloria bash -c "lncli -n regtest addinvoice 10000 | jq .payment_request")
+gloria_invoice=$(docker-compose exec -T Gloria bash -c "lncli -n regtest addinvoice 10000 | jq -r .payment_request")
 
-# Remove quotes
-gloria_invoice=${gloria_invoice//\"}
 echo Gloria invoice ${gloria_invoice}
 
 echo Wait for channel establishment - 60 seconds for 6 blocks