diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh index 3cb72dd..be2e56c 100644 --- a/home.admin/00settingsMenuServices.sh +++ b/home.admin/00settingsMenuServices.sh @@ -2,27 +2,27 @@ # get raspiblitz config source /mnt/hdd/raspiblitz.conf +if [ ${#autoPilot} -eq 0 ]; then autoPilot="off"; fi +if [ ${#autoNatDiscovery} -eq 0 ]; then autoNatDiscovery="off"; fi +if [ ${#runBehindTor} -eq 0 ]; then runBehindTor="off"; fi +if [ ${#rtlWebinterface} -eq 0 ]; then rtlWebinterface="off"; fi +if [ ${#chain} -eq 0 ]; then chain="main"; fi + +# map chain to on/off +chainValue="off" +if [ "${chain}" = "test" ]; then chainValue="on"; fi # show select dialog -CHOICES=$(dialog --checklist "Activate/Deactivate Services:" 15 40 5 \ +CHOICES=$(dialog --checklist "Activate/Deactivate Services:" 15 40 6 \ 1 "Channel Autopilot" ${autoPilot} \ -2 "Testnet" ${chain} \ +2 "Testnet" ${chainValue} \ 3 "Router AutoNAT" ${autoNatDiscovery} \ 4 "Run behind TOR" ${runBehindTor} \ 5 "RTL Webinterface" ${rtlWebinterface} \ 2>&1 >/dev/tty) -#CHOICES=$(dialog --checklist "Activate/Deactivate Services:" 15 40 5 \ -#1 "Channel Autopilot" ${autoPilot} \ -#2 "UPnP Router-Portforwarding" ${natUPnP} \ -#3 "Auto Unlock on Start" ${autoUnlock} \ -#4 "Seed Torrent Blockchain" ${torrentSeed} \ -#4 "RTL Webinterface" ${rtlWebinterface} \ -#2>&1 >/dev/tty) dialogcancel=$? clear -rideTheLighthing - # check if user canceled dialog if [ ${dialogcancel} -eq 1 ]; then echo "user canceled" diff --git a/home.admin/config.scripts/network.chain.sh b/home.admin/config.scripts/network.chain.sh index acc2071..8ae4c44 100755 --- a/home.admin/config.scripts/network.chain.sh +++ b/home.admin/config.scripts/network.chain.sh @@ -20,7 +20,7 @@ source /mnt/hdd/raspiblitz.conf 2>/dev/null if [ ${#network} -eq 0 ]; then echo "FAIL - missing /mnt/hdd/raspiblitz.conf" exit 1 -fi +fi # testnet on litecoin cannot be set if [ "${network}" = "litecoin" ] && [ "$1" = "testnet" ]; then