Creating or paying invoices, wait for lnd to get ready

Also put redundant code into XXchainInSync.sh

home.admin/BBcreateInvoice.sh

@@ -13,33 +13,9 @@ if [ ${#chain} -eq 0 ]; then
   chain=$(${network}-cli getblockchaininfo | jq -r '.chain')
 fi
 
-echo ""
-echo "*** Precheck ***"
-
-# check if chain is in sync
-cmdChainInSync="lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c"
-chainInSync=$(cmdChainInSync)
-while [ ${chainInSync} -eq 0 ]; do
-  dialog --title "Fail: not in sync" \
-	 --ok-label "Try now" \
-	 --cancel-label "Give up" \
-	 --pause "\n\n'lncli getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
-  
-  if [ $? -gt 0 ]; then
-      exit 1
-  fi
-  chainInSync=$(cmdChainInSync)
-done
-
-# check number of connected peers
-echo "check for open channels"
-openChannels=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | grep chan_id -c)
-if [ ${openChannels} -eq 0 ]; then
-  echo ""
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo ""
+# Check if ready (chain in sync and channels open)
+./XXchainInSync.sh $network $chain
+if [ $? != 0 ]; then
   exit 1
 fi
 

home.admin/BBpayInvoice.sh

@@ -12,32 +12,10 @@ if [ ${#chain} -eq 0 ]; then
   chain=$(${network}-cli getblockchaininfo | jq -r '.chain')
 fi
 
-echo ""
-echo "*** Precheck ***"
-echo "please wait a moment ..."
-
-# check if chain is in sync
-chainInSync=$(lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c)
-if [ ${chainInSync} -eq 0 ]; then
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo "FAIL - 'lncli getinfo' shows 'synced_to_chain': false"
-  echo "Wait until chain is sync with LND and try again."
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo ""
-  exit 1
-fi
-
-
-# check number of connected peers
-echo "check for open channels"
-openChannels=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | grep chan_id -c)
-if [ ${openChannels} -eq 0 ]; then
-  echo ""
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo ""
-  exit 1
+# Check if ready (chain in sync and channels open)
+./XXchainInSync.sh $network $chain
+if [ $? != 0 ]; then
+    exit 1
 fi
 
 paymentRequestStart="???"
@@ -118,4 +96,4 @@ else
   echo "******************************"
   echo "It worked :) - check out the service you were paying."
 fi
-echo ""
+echo ""

home.admin/XXchainInSync.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Check if lnd is synced to chain and channels are open
+# If it isn't, wait until it is
+# exits with 1 if it isn't.
+
+network=$1
+chain=$2
+
+# check if chain is in sync
+cmdChainInSync="lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c"
+chainInSync=${cmdChainInSync}
+while [ $chainInSync -eq 0 ]; do
+  dialog --title "Fail: not in sync" \
+	 --ok-label "Try now" \
+	 --cancel-label "Give up" \
+	 --pause "\n\n'lncli getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
+  
+  if [ $? -gt 0 ]; then
+      exit 1
+  fi
+  chainInSync=${cmdChainInSync}
+done
+
+# check number of connected peers
+echo "check for open channels"
+openChannels=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | grep chan_id -c)
+if [ ${openChannels} -eq 0 ]; then
+  echo ""
+  echo "!!!!!!!!!!!!!!!!!!!"
+  echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
+  echo "!!!!!!!!!!!!!!!!!!!"
+  echo ""
+  exit 1
+fi
+
+exit 0