From b34d409f02751b61c314775c6274bfda3a7d7a17 Mon Sep 17 00:00:00 2001 From: openoms Date: Fri, 13 Aug 2021 09:30:57 +0100 Subject: [PATCH] use $lightning and $chain for status display --- home.admin/00infoLCD.sh | 8 ++++---- home.admin/config.scripts/blitz.statusscan.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh index ad1c83f19..e87a6079a 100755 --- a/home.admin/00infoLCD.sh +++ b/home.admin/00infoLCD.sh @@ -20,7 +20,7 @@ function usage() { verbose=0 pause=12 -# this is used by touchscreen and command 'satus' +# this is used by touchscreen and command 'status' # TODO: remove on v1.8 while [[ "$1" == -* ]]; do case "$1" in @@ -101,9 +101,9 @@ while : fi - # TODO: ALSO SEPERATE GUI/ACTION FOR THE SCANNING / WALLET UNLOCK / ERROR DETECTION + # TODO: ALSO SEPARATE GUI/ACTION FOR THE SCANNING / WALLET UNLOCK / ERROR DETECTION # if lightning is syncing or scanning - source <(sudo /home/admin/config.scripts/blitz.statusscan.sh) + source <(sudo /home/admin/config.scripts/blitz.statusscan.sh $lightning) if [ "${syncedToChain}" != "1" ]; then /home/admin/setup.scripts/eventBlockchainSync.sh lcd sleep 10 @@ -111,7 +111,7 @@ while : fi # no special case - show status display - /home/admin/00infoBlitz.sh + /home/admin/00infoBlitz.sh $lightning ${chain}net sleep 5 done diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh index 789299e30..0b8173377 100755 --- a/home.admin/config.scripts/blitz.statusscan.sh +++ b/home.admin/config.scripts/blitz.statusscan.sh @@ -272,7 +272,7 @@ fi clnRunning=$(systemctl status ${netprefix}lightningd.service 2>/dev/null | grep -c running) echo "clnActive=${clnRunning}" if [ ${clnRunning} -eq 1 ]; then - clnInfo=$(sudo -u bitcoin lightning-cli getinfo) + clnInfo=$($lightningcli_alias getinfo) clnBlockHeight=$(echo "${clnInfo}" | jq -r '.blockheight' | tr -cd '[[:digit:]]') scanProgress=$(echo "scale=2; $clnBlockHeight*100/$total" | bc) echo "scanProgress=${scanProgress}"