From 64eeb8944ca17435303b2e85718dd5072e12054c Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Tue, 29 Jun 2021 13:25:25 +0100
Subject: [PATCH] all lncli_aliases to be used as variables

---
 home.admin/BBcreateInvoice.sh           | 10 +++-------
 home.admin/BBpayInvoice.sh              | 10 +++-------
 home.admin/config.scripts/lnd.unlock.sh |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh
index ab8b39f84..84f338d33 100755
--- a/home.admin/BBcreateInvoice.sh
+++ b/home.admin/BBcreateInvoice.sh
@@ -17,14 +17,10 @@ fi
 source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
 
 source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net)
-shopt -s expand_aliases
-alias bitcoincli_alias="$bitcoincli_alias"
-alias lncli_alias="$lncli_alias"
-alias lightningcli_alias="$lightningcli_alias"
 
 # check if chain is in sync
 if [ $LNTYPE = cln ];then
-  lncommand="lightning-cli"
+  lncommand="${netprefix}lightning-cli"
   BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1)
   CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight)
   if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
@@ -33,8 +29,8 @@ if [ $LNTYPE = cln ];then
     cmdChainInSync=0
   fi
 elif [ $LNTYPE = lnd ];then
-  lncommand="lncli"
-  cmdChainInSync="lncli_alias getinfo | grep '"synced_to_chain": true' -c"
+  lncommand="${netprefix}lncli"
+  cmdChainInSync="$lncli_alias getinfo | grep '"synced_to_chain": true' -c"
 fi
 chainInSync=${cmdChainInSync}
 while [ "${chainInSync}" == "0" ]; do
diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh
index 2589584f4..5aa57e31e 100755
--- a/home.admin/BBpayInvoice.sh
+++ b/home.admin/BBpayInvoice.sh
@@ -17,14 +17,10 @@ fi
 source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
 
 source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net)
-shopt -s expand_aliases
-alias bitcoincli_alias="$bitcoincli_alias"
-alias lncli_alias="$lncli_alias"
-alias lightningcli_alias="$lightningcli_alias"
 
 # check if chain is in sync
 if [ $LNTYPE = cln ];then
-  lncommand="lightning-cli"
+  lncommand="${netprefix}lightning-cli"
   BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1)
   CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight)
   if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
@@ -33,8 +29,8 @@ if [ $LNTYPE = cln ];then
     cmdChainInSync=0
   fi
 elif [ $LNTYPE = lnd ];then
-  lncommand="lncli"
-  cmdChainInSync="lncli_alias getinfo | grep '"synced_to_chain": true' -c"
+  lncommand="${netprefix}lncli"
+  cmdChainInSync="$lncli_alias getinfo | grep '"synced_to_chain": true' -c"
 fi
 chainInSync=${cmdChainInSync}
 while [ "${chainInSync}" == "0" ]; do
diff --git a/home.admin/config.scripts/lnd.unlock.sh b/home.admin/config.scripts/lnd.unlock.sh
index e5b828323..62e744d59 100755
--- a/home.admin/config.scripts/lnd.unlock.sh
+++ b/home.admin/config.scripts/lnd.unlock.sh
@@ -66,7 +66,7 @@ while [ ${fallback} -eq 0 ]
         recoveryOption="--recovery_window=1000 "
         echo "# runnign unlock with ${recoveryOption}"
     fi
-    result=$(echo "$passwordC" | sudo -u bitcoin lncli --chain=${network} --network=${chain}net unlock ${recoveryOption}--stdin 2>&1)
+    result=$(echo "$passwordC" | $lncli_alias unlock ${recoveryOption}--stdin 2>&1)
     wasUnlocked=$(echo "${result}" | grep -c 'successfully unlocked')
     wrongPassword=$(echo "${result}" | grep -c 'invalid passphrase')
     if [ ${wasUnlocked} -gt 0 ]; then