#2080 Add chantools to commands, menu & services (#2097)

CHANGES.md

@@ -5,6 +5,7 @@
 - New: Raspberry Pi OS Base Image 64-bit (August 2020)
 - New: Build SD card Image with parameters & FatPack [details](https://github.com/rootzoll/raspiblitz/pull/2044)
 - New: Lightning Terminal 0.4.1-alpha (Loop, Pool & Faraday UI Bundle) [details](https://github.com/lightninglabs/lightning-terminal#lightning-terminal-lit)
+- New: chantools 0.8.2 [details](https://github.com/guggero/chantools/blob/master/README.md)
 - New: Telegraf metrics (experimental) [details](https://github.com/rootzoll/raspiblitz/issues/1369)
 - New: Download whitepaper from blockchain [details](https://github.com/rootzoll/raspiblitz/pull/2017)
 - Update: bitcoin-core version 0.21.0-beta [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.21.0.md)

home.admin/00mainMenu.sh

@@ -116,6 +116,9 @@ fi
 if [ "${sphinxrelay}" == "on" ]; then
   OPTIONS+=(SPHINX "Sphinx Chat Relay")
 fi
+if [ "${chantools}" == "on" ]; then
+  OPTIONS+=(CHANTOOLS "ChannelTools (Fund Rescue)")
+fi
 
 # Basic Options
 OPTIONS+=(INFO "RaspiBlitz Status Screen")
@@ -261,6 +264,9 @@ case $CHOICE in
         SPHINX)
             sudo /home/admin/config.scripts/bonus.sphinxrelay.sh menu
             ;;
+        CHANTOOLS)
+            sudo /home/admin/config.scripts/bonus.chantools.sh menu
+            ;;
         SUBSCRIBE)
             /home/admin/config.scripts/blitz.subscriptions.py
             ;;

home.admin/00settingsMenuServices.sh

@@ -21,6 +21,7 @@ if [ ${#thunderhub} -eq 0 ]; then thunderhub="off"; fi
 if [ ${#sphinxrelay} -eq 0 ]; then sphinxrelay="off"; fi
 if [ ${#lit} -eq 0 ]; then lit="off"; fi
 if [ ${#whitepaper} -eq 0 ]; then whitepaper="off"; fi
+if [ ${#chantools} -eq 0 ]; then chantools="off"; fi
 
 # show select dialog
 echo "run dialog ..."
@@ -39,6 +40,7 @@ OPTIONS+=(j 'JoinMarket' ${joinmarket})
 OPTIONS+=(o 'Balance of Satoshis' ${bos})
 OPTIONS+=(x 'Sphinx-Relay' ${sphinxrelay})
 OPTIONS+=(y 'PyBLOCK' ${pyblock})
+OPTIONS+=(c 'ChannelTools (Fund Rescue)' ${chantools})
 OPTIONS+=(w 'Download Bitcoin Whitepaper' ${whitepaper})
 
 CHOICES=$(dialog --title ' Additional Services ' --checklist ' use spacebar to activate/de-activate ' 20 45 12  "${OPTIONS[@]}" 2>&1 >/dev/tty)
@@ -237,6 +239,21 @@ else
   echo "lndmanage setting unchanged."
 fi
 
+# CHANTOOLS process choice
+choice="off"; check=$(echo "${CHOICES}" | grep -c "c")
+if [ ${check} -eq 1 ]; then choice="on"; fi
+if [ "${chantools}" != "${choice}" ]; then
+  echo "chantools Setting changed .."
+  anychange=1
+  sudo -u admin /home/admin/config.scripts/bonus.chantools.sh ${choice}
+  source /mnt/hdd/raspiblitz.conf
+  if [ "${chantools}" =  "on" ]; then
+    sudo -u admin /home/admin/config.scripts/bonus.chantools.sh menu
+  fi
+else
+  echo "chantools setting unchanged."
+fi
+
 # Balance of Satoshis process choice
 choice="off"; check=$(echo "${CHOICES}" | grep -c "o")
 if [ ${check} -eq 1 ]; then choice="on"; fi

home.admin/_commands.sh

@@ -167,6 +167,21 @@ function pyblock() {
   fi
 }
 
+# command: chantools
+# switch to the bitcoin user for chantools
+function chantools() {
+  if [ $(grep -c "chantools=on" < /mnt/hdd/raspiblitz.conf) -eq 1 ]; then
+    echo "# switching to the bitcoin user with the command: 'sudo su - bitcoin'"
+    echo "# use command 'exit' and then 'raspiblitz' to return to menu"
+    echo "# use command 'chantools' again to start"
+    sudo su - bitcoin
+    echo "# use command 'raspiblitz' to return to menu"
+  else
+    echo "chantools is not installed - to install run:"
+    echo "/home/admin/config.scripts/bonus.chantools.sh on"
+  fi
+}
+
 # command: jm
 # switch to the joinmarket user for the JoininBox menu
 function jm() {
@@ -195,7 +210,6 @@ function faraday() {
   fi
 }
 
-
 # command: lit
 # switch to the lit user for the loop, pool & faraday services
 function lit() {

home.admin/config.scripts/bonus.chantools.sh

@@ -17,7 +17,7 @@ fi
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
  echo "Channel Tools install script"
- echo "/home/admin/config.scrips/bonus.chantools.sh on|off|menu"
+ echo "/home/admin/config.scripts/bonus.chantools.sh on|off|menu"
  echo "Installs the version $pinnedVersion by default."
  exit 1
 fi
@@ -29,12 +29,12 @@ fi
 
 # show info menu
 if [ "$1" = "menu" ]; then
-  dialog --title " Channel Tools " --msgbox "
-Channel Tools is a command line tool.
-Type: 'sudo su - bitcoin' in the command line to switch to the bitcoin user.
-Then see 'chantools' for the options.
+  dialog --title " Channel Tools ${pinnedVersion} " --msgbox "\n
+Channel Tools is a command line tool to rescue locked funds.\n\n
+On terminal use command 'chantools' and follow instructions.\n\n
 Usage: https://github.com/guggero/chantools/blob/master/README.md
-" 10 75
+" 11 75
+  clear
   exit 0
 fi