From fc976f6f67c9761eb3dea9ca235dab3929ac5fb4 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Tue, 4 Dec 2018 00:51:17 +0100 Subject: [PATCH] RTL Unlock infos --- home.admin/00mainMenu.sh | 13 ++++++++++--- home.admin/AAunlockLND.sh | 8 ++++++-- home.admin/BBcloseAllChannels.sh | 2 +- home.admin/_bootstrap.sh | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh index 625db45..d8600ea 100755 --- a/home.admin/00mainMenu.sh +++ b/home.admin/00mainMenu.sh @@ -173,9 +173,16 @@ else locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep -c unlock) if [ ${locked} -gt 0 ]; then - # LOCK SCREEN - MENU="!!! YOUR WALLET IS LOCKED !!!" - OPTIONS+=(U "Unlock your Lightning Wallet with 'lncli unlock'") + if [ "${rtlWebinterface}" = "on" ]; then + # WEBINTERFACE INFO LOCK SCREEN + TITLE="Webinterface: http://${localip}:3000" + MENU="IMPORTANT: Please unlock thru the RTL Webinterface." + OPTIONS+=(U "ONLY BACKUP Unlock with 'lncli unlock'") + else + # NORMAL LOCK SCREEN + MENU="!!! YOUR WALLET IS LOCKED !!!" + OPTIONS+=(U "Unlock your Lightning Wallet with 'lncli unlock'") + fi else diff --git a/home.admin/AAunlockLND.sh b/home.admin/AAunlockLND.sh index fc2e388..9886c10 100755 --- a/home.admin/AAunlockLND.sh +++ b/home.admin/AAunlockLND.sh @@ -1,7 +1,11 @@ #!/bin/sh -# load network -network=`cat .network` +# load raspiblitz config data (with backup from old config) +source /mnt/hdd/raspiblitz.conf 2>/dev/null +if [ ${#network} -eq 0 ]; then network=`cat .network`; fi +if [ ${#chain} -eq 0 ]; then + chain=$(${network}-cli getblockchaininfo | jq -r '.chain') +fi echo "" echo "****************************************************************************" diff --git a/home.admin/BBcloseAllChannels.sh b/home.admin/BBcloseAllChannels.sh index 005f9c8..adb2354 100755 --- a/home.admin/BBcloseAllChannels.sh +++ b/home.admin/BBcloseAllChannels.sh @@ -4,7 +4,7 @@ source /mnt/hdd/raspiblitz.conf 2>/dev/null if [ ${#network} -eq 0 ]; then network=`cat .network`; fi if [ ${#chain} -eq 0 ]; then - chain=$(${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo | jq -r '.chain') + chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi # precheck: AutoPilot diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index 99f5d14..d6d889d 100644 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -327,7 +327,7 @@ fi # RideTheLightning RTL # rtlWebinterface=off|on -if [ ${#runBehindTor} -eq 0 ]; then +if [ ${#rtlWebinterface} -eq 0 ]; then echo "rtlWebinterface=off" >> $configFile fi