From c4937558ab76d8f4a2ab9787f6da6cb92232ffaf Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 3 Aug 2021 17:17:07 +0200
Subject: [PATCH] settings adapt to running lightning impl

---
 home.admin/00settingsMenuBasics.sh   | 62 +++++++++++++++++++++--
 home.admin/00settingsMenuServices.sh | 75 +++++++---------------------
 2 files changed, 76 insertions(+), 61 deletions(-)

diff --git a/home.admin/00settingsMenuBasics.sh b/home.admin/00settingsMenuBasics.sh
index 3c5cce643..caafcc8fd 100755
--- a/home.admin/00settingsMenuBasics.sh
+++ b/home.admin/00settingsMenuBasics.sh
@@ -78,21 +78,26 @@ WIDTH=45
 OPTIONS=()
 
 OPTIONS+=(t 'Run behind TOR' ${runBehindTor})
+
 if [ "${displayClass}" == "lcd" ]; then
   OPTIONS+=(s 'Touchscreen' ${touchscreenMenu}) 
   OPTIONS+=(r 'LCD Rotate' ${lcdrotateMenu})  
 fi
-if [ ${chain} = "main" ];then
+
+if [ "${lightning}" == "lnd" ]; then
   OPTIONS+=(a 'Channel Autopilot' ${autoPilot}) 
   OPTIONS+=(k 'Accept Keysend' ${keysend})  
-  # OPTIONS+=(n 'Testnet' ${chainValue}) # deprecated option
-  # see the parallel network in SERVICES
   OPTIONS+=(c 'Circuitbreaker (LND firewall)' ${circuitbreaker})  
   OPTIONS+=(u 'LND Auto-Unlock' ${autoUnlock})  
   OPTIONS+=(d 'StaticChannelBackup on DropBox' ${DropboxBackup})
   OPTIONS+=(e 'StaticChannelBackup on USB Drive' ${LocalBackup})
 fi
+
 OPTIONS+=(z 'ZeroTier' ${zerotierSwitch})
+OPTIONS+=(t 'Parallel Testnet services' ${testnet})
+
+# choose c-lightning just at setup for now
+#OPTIONS+=(n 'C-lightning' ${cln})
 
 if [ ${chain} = "main" ];then
   if [ ${#runBehindTor} -eq 0 ] || [ "${runBehindTor}" = "off" ]; then
@@ -430,6 +435,57 @@ else
   echo "ZeroTier setting unchanged."
 fi
 
+# testnet process choice
+choice="off"; check=$(echo "${CHOICES}" | grep -c "t")
+if [ ${check} -eq 1 ]; then choice="on"; fi
+if [ "${testnet}" != "${choice}" ]; then
+  echo "# Testnet Setting changed .."
+  anychange=1
+  /home/admin/config.scripts/bitcoin.chains.sh ${choice} testnet
+  errorOnInstall=$?
+  if [ "${choice}" =  "on" ]; then
+    if [ ${errorOnInstall} -eq 0 ]; then
+      echo "# Successfully installed Testnet"
+      echo
+      echo "# Press ENTER to continue ..."
+      read key
+    else
+      l1="# !!! FAIL on Testnet install !!!"
+      l2="# Try manual install on terminal after reboot with:"
+      l3="/home/admin/config.scripts/bitcoin.chains.sh on testnet"
+      dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65
+    fi
+  fi
+else
+  echo "# Testnet Setting unchanged."
+fi
+
+
+# cln process choice
+#choice="off"; check=$(echo "${CHOICES}" | grep -c "n")
+#if [ ${check} -eq 1 ]; then choice="on"; fi
+#if [ "${cln}" != "${choice}" ]; then
+#  echo "# C-lightning Setting changed .."
+#  anychange=1
+#  /home/admin/config.scripts/cln.install.sh ${choice}
+#  errorOnInstall=$?
+#  if [ "${choice}" =  "on" ]; then
+#    if [ ${errorOnInstall} -eq 0 ]; then
+#      echo "# Successfully installed C-lightning"
+#      echo
+#      echo "# Press ENTER to continue ..."
+#      read key
+#    else
+#      l1="# !!! FAIL on C-lightning install !!!"
+#      l2="# Try manual install on terminal after reboot with:"
+#      l3="/home/admin/config.scripts/cln.install.sh on"
+#      dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65
+#    fi
+#  fi
+#else
+#  echo "# C-lightning Setting unchanged."
+#fi
+
 if [ ${anychange} -eq 0 ]; then
      dialog --msgbox "NOTHING CHANGED!\nUse Spacebar to check/uncheck services." 8 58
      exit 0
diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh
index d43ed1b11..832011a15 100755
--- a/home.admin/00settingsMenuServices.sh
+++ b/home.admin/00settingsMenuServices.sh
@@ -32,21 +32,29 @@ echo "run dialog ..."
 OPTIONS=()
 OPTIONS+=(e 'Electrum Rust Server' ${ElectRS})
 OPTIONS+=(r 'RTL Webinterface' ${rtlWebinterface})
-OPTIONS+=(t 'ThunderHub' ${thunderhub})
-OPTIONS+=(l 'LIT (loop, pool, faraday)' ${lit})
 OPTIONS+=(p 'BTCPayServer' ${BTCPayServer})
-OPTIONS+=(i 'LNbits' ${LNBits})
 OPTIONS+=(b 'BTC-RPC-Explorer' ${BTCRPCexplorer})
 OPTIONS+=(s 'Cryptoadvance Specter' ${specter})
 OPTIONS+=(a 'Mempool Space' ${mempoolExplorer})
+
+# just available for LND
+if [ "${lightning}" == "lnd" ]; then
+  OPTIONS+=(t 'ThunderHub' ${thunderhub})
+  OPTIONS+=(l 'LIT (loop, pool, faraday)' ${lit})
+  OPTIONS+=(i 'LNbits' ${LNBits})
+  OPTIONS+=(o 'Balance of Satoshis' ${bos})
+  OPTIONS+=(y 'PyBLOCK' ${pyblock})
+  OPTIONS+=(h 'ChannelTools (Fund Rescue)' ${chantools})
+  OPTIONS+=(x 'Sphinx-Relay' ${sphinxrelay})
+fi
+
+# just available for CLN
+if [ "${lightning}" == "cln" ]; then
+  # none yet
+fi
+
 OPTIONS+=(j 'JoinMarket' ${joinmarket})
-OPTIONS+=(o 'Balance of Satoshis' ${bos})
-OPTIONS+=(x 'Sphinx-Relay' ${sphinxrelay})
-OPTIONS+=(y 'PyBLOCK' ${pyblock})
-OPTIONS+=(h 'ChannelTools (Fund Rescue)' ${chantools})
 OPTIONS+=(w 'Download Bitcoin Whitepaper' ${whitepaper})
-OPTIONS+=(n 'Parallel Testnet services' ${testnet})
-OPTIONS+=(c 'C-lightning' ${cln})
 
 CHOICES=$(dialog --title ' Additional Services ' \
           --checklist ' use spacebar to activate/de-activate ' \
@@ -436,55 +444,6 @@ else
   echo "Whitepaper setting unchanged."
 fi
 
-# testnet process choice
-choice="off"; check=$(echo "${CHOICES}" | grep -c "n")
-if [ ${check} -eq 1 ]; then choice="on"; fi
-if [ "${testnet}" != "${choice}" ]; then
-  echo "# Testnet Setting changed .."
-  anychange=1
-  /home/admin/config.scripts/bitcoin.chains.sh ${choice} testnet
-  errorOnInstall=$?
-  if [ "${choice}" =  "on" ]; then
-    if [ ${errorOnInstall} -eq 0 ]; then
-      echo "# Successfully installed Testnet"
-      echo
-      echo "# Press ENTER to continue ..."
-      read key
-    else
-      l1="# !!! FAIL on Testnet install !!!"
-      l2="# Try manual install on terminal after reboot with:"
-      l3="/home/admin/config.scripts/bitcoin.chains.sh on testnet"
-      dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65
-    fi
-  fi
-else
-  echo "# Testnet Setting unchanged."
-fi
-
-# cln process choice
-choice="off"; check=$(echo "${CHOICES}" | grep -c "c")
-if [ ${check} -eq 1 ]; then choice="on"; fi
-if [ "${cln}" != "${choice}" ]; then
-  echo "# C-lightning Setting changed .."
-  anychange=1
-  /home/admin/config.scripts/cln.install.sh ${choice}
-  errorOnInstall=$?
-  if [ "${choice}" =  "on" ]; then
-    if [ ${errorOnInstall} -eq 0 ]; then
-      echo "# Successfully installed C-lightning"
-      echo
-      echo "# Press ENTER to continue ..."
-      read key
-    else
-      l1="# !!! FAIL on C-lightning install !!!"
-      l2="# Try manual install on terminal after reboot with:"
-      l3="/home/admin/config.scripts/cln.install.sh on"
-      dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65
-    fi
-  fi
-else
-  echo "# C-lightning Setting unchanged."
-fi
 
 if [ ${anychange} -eq 0 ]; then
      dialog --msgbox "NOTHING CHANGED!\nUse Spacebar to check/uncheck services." 8 58