From 7ca6b68cb748828e2b10abf0bec5f06e9638c34d Mon Sep 17 00:00:00 2001 From: openoms Date: Sun, 18 Jul 2021 20:07:07 +0100 Subject: [PATCH] SYSTEM menu fixes --- home.admin/00mainMenu.sh | 2 +- home.admin/00parallelChainsMenu.sh | 6 ++++-- home.admin/99systemMenu.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh index 9d775bdbb..46f73ee86 100755 --- a/home.admin/00mainMenu.sh +++ b/home.admin/00mainMenu.sh @@ -263,7 +263,7 @@ case $CHOICE in /home/admin/99connectMenu.sh ;; SYSTEM) - /home/admin/99systemMenu.sh + /home/admin/99systemMenu.sh ${chain}net ;; SCREEN) dialog --title 'Touchscreen Calibration' --msgbox 'Choose OK and then follow the instructions on touchscreen for calibration.\n\nBest is to use a stylus for accurate touchscreen interaction.' 9 48 diff --git a/home.admin/00parallelChainsMenu.sh b/home.admin/00parallelChainsMenu.sh index 34d2c3b94..cd4c13e1f 100644 --- a/home.admin/00parallelChainsMenu.sh +++ b/home.admin/00parallelChainsMenu.sh @@ -14,9 +14,11 @@ fi source /mnt/hdd/raspiblitz.conf # CHAIN is signet | testnet | mainnet -if [ $# -gt 0 ] && [ $1 != ${chain}net ];then - nonDefaultChain=1 +if [ $# -gt 0 ]; then CHAIN=$1 + if [ $1 != ${chain}net ];then + nonDefaultChain=1 + fi else nonDefaultChain=0 CHAIN=${chain}net diff --git a/home.admin/99systemMenu.sh b/home.admin/99systemMenu.sh index d1a5a74a2..817031027 100644 --- a/home.admin/99systemMenu.sh +++ b/home.admin/99systemMenu.sh @@ -22,7 +22,7 @@ OPTIONS+=(${network}CONF "Edit the bitcoin.conf") OPTIONS+=(LNDLOG "Monitor the lnd.log for ${CHAIN}") OPTIONS+=(LNDCONF "Edit the lnd.conf for ${CHAIN}") -if grep "${netprefix}cln=on" /mnt/hdd/raspiblitz.conf;then +if grep "^${netprefix}cln=on" /mnt/hdd/raspiblitz.conf;then OPTIONS+=(CLNLOG "Monitor the CLN log for ${CHAIN}") OPTIONS+=(CLNCONF "Edit the CLN config for ${CHAIN}") HEIGHT=$((HEIGHT+2))