RTL v0.13.0 update (#3293)

CHANGES.md

@@ -3,7 +3,8 @@
 ## What's new in Version 1.8.1 of RaspiBlitz?
  
 - New: Support of X708 UPS HAT [details](https://github.com/rootzoll/raspiblitz/pull/3087)
-- Update: LND v0.15.1 [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.15.1-beta)
+- Update: LND v0.15.1 [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.15.1-beta
+- Update: RTL v0.13.0 with update option [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.12.3)
 - Update: LNbits 0.9.2 [details](https://github.com/lnbits/lnbits-legend/releases/tag/0.9.2)
 - Info: Run RaspiBlitz on Proxmox [details](https://github.com/rootzoll/raspiblitz/tree/dev/alternative.platforms/Proxmox)
 - Update: Core Lightning v0.12.1 [details](https://github.com/ElementsProject/lightning/releases/tag/v0.12.1)

home.admin/99updateMenu.sh

@@ -476,6 +476,10 @@ if [ "${bos}" == "on" ]; then
   OPTIONS+=(BOS "Update Balance of Satoshis")
 fi
 
+if [ "${RTL}" == "on" ]||[ "${cRTL}" == "on" ]; then
+  OPTIONS+=(RTL "Update RTL")
+fi
+
 if [ "${thunderhub}" == "on" ]; then
   OPTIONS+=(THUB "Update ThunderHub")
 fi
@@ -539,6 +543,9 @@ case $CHOICE in
   BOS)
     /home/admin/config.scripts/bonus.bos.sh update
     ;;
+  RTL)
+    /home/admin/config.scripts/bonus.rtl.sh update
+    ;;
   THUB)
     /home/admin/config.scripts/bonus.thunderhub.sh update
     ;;

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # https://github.com/Ride-The-Lightning/RTL/releases
-RTLVERSION="v0.12.3"
+RTLVERSION="v0.13.0"
 
 # check and load raspiblitz config
 # to know which network is running
@@ -15,6 +15,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
   echo "# bonus.rtl.sh [on|off|menu] <lnd|cl> <mainnet|testnet|signet> <purge>"
   echo "# bonus.rtl.sh connect-services"
   echo "# bonus.rtl.sh prestart <lnd|cl> <mainnet|testnet|signet>"
+  echo "# bonus.rtl.sh update <commit>"
   exit 1
 fi
 
@@ -180,7 +181,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     # install
     echo "# Running npm install ..."
     export NG_CLI_ANALYTICS=false
-    sudo -u rtl npm install --only=prod --logLevel warn
+    sudo -u rtl npm install --omit=dev
     if ! [ $? -eq 0 ]; then
       echo "# FAIL - npm install did not run correctly - deleting code and exit"
       sudo rm -r /home/rtl/RTL
@@ -507,51 +508,69 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
   exit 0
 fi
 
-# DEACTIVATED FOR NOW:
+
-# - parameter scheme is conflicting with setting all prefixes etc
+if [ "$1" = "update" ]; then
-# - also just updating to latest has high change of breaking
+  echo "# UPDATING RTL"
-#if [ "$1" = "update" ]; then
+  cd /home/rtl/RTL || exit 1
-#  echo "# UPDATING RTL"
+  updateOption="$2"
-#  cd /home/rtl/RTL
+  if [ ${#updateOption} -eq 0 ]; then
-#  updateOption="$2"
+    # from https://github.com/apotdevin/thunderhub/blob/master/scripts/updateToLatest.sh
-#  if [ ${#updateOption} -eq 0 ]; then
+    # fetch latest master
-#    # from https://github.com/apotdevin/thunderhub/blob/master/scripts/updateToLatest.sh
+    sudo -u rtl git fetch
-#    # fetch latest master
+    # unset $1
-#    sudo -u rtl git fetch
+    set --
-#    # unset $1
+    UPSTREAM=${1:-'@{u}'}
-#    set --
+    LOCAL=$(git rev-parse @)
-#    UPSTREAM=${1:-'@{u}'}
+    REMOTE=$(git rev-parse "$UPSTREAM")
-#    LOCAL=$(git rev-parse @)
+    if [ $LOCAL = $REMOTE ]; then
-#    REMOTE=$(git rev-parse "$UPSTREAM")
+      TAG=$(git tag | sort -V | grep -v rc | tail -1)
-#    if [ $LOCAL = $REMOTE ]; then
+      echo "# You are up-to-date on version" $TAG
-#      TAG=$(git tag | sort -V | tail -1)
+    else
-#      echo "# You are up-to-date on version" $TAG
+      echo "# Pulling latest changes..."
-#    else
+      sudo -u rtl git pull -p
-#      echo "# Pulling latest changes..."
+      echo "# Reset to the latest release tag"
-#      sudo -u rtl git pull -p
+      TAG=$(git tag | sort -V | grep -v rc | tail -1)
-#      echo "# Reset to the latest release tag"
+      sudo -u rtl git reset --hard $TAG
-#      TAG=$(git tag | sort -V | tail -1)
+      echo "# updating to the latest"
-#      sudo -u rtl git reset --hard $TAG
+      # https://github.com/Ride-The-Lightning/RTL#or-update-existing-dependencies
-#      echo "# updating to the latest"
+      echo "# Running npm install ..."
-#      # https://github.com/Ride-The-Lightning/RTL#or-update-existing-dependencies
+      export NG_CLI_ANALYTICS=false
-#      sudo -u rtl npm install --only=prod
+      sudo -u rtl npm install --omit=dev
-#      echo "# Updated to version" $TAG
+      if ! [ $? -eq 0 ]; then
-#    fi
+        echo "# FAIL - npm install did not run correctly - deleting code and exit"
-#  elif [ "$updateOption" = "commit" ]; then
+        sudo rm -r /home/rtl/RTL
-#    echo "# updating to the latest commit in https://github.com/Ride-The-Lightning/RTL"
+        exit 1
-#    sudo -u rtl git pull -p
+      else
-#    sudo -u rtl npm install --only=prod
+        echo "# OK - RTL install looks good"
-#    currentRTLcommit=$(cd /home/rtl/RTL; git describe --tags)
+        echo
-#    echo "# Updated RTL to $currentRTLcommit"
+      fi
-#  else
+      echo "# Updated to version" $TAG
-#    echo "# Unknown option: $updateOption"
+    fi
-#  fi
+  elif [ "$updateOption" = "commit" ]; then
-#
+    echo "# updating to the latest commit in https://github.com/Ride-The-Lightning/RTL"
-#  echo
+    sudo -u rtl git pull -p
-#  echo "# Starting the RTL service ... "
+    echo "# Running npm install ..."
-#  sudo systemctl start RTL
+    export NG_CLI_ANALYTICS=false
-#  exit 0
+    sudo -u rtl npm install --only=prod --logLevel warn
-#fi
+    if ! [ $? -eq 0 ]; then
+      echo "# FAIL - npm install did not run correctly - deleting code and exit"
+      sudo rm -r /home/rtl/RTL
+      exit 1
+    else
+      echo "# OK - RTL install looks good"
+      echo
+    fi
+    currentRTLcommit=$(cd /home/rtl/RTL; git describe --tags)
+    echo "# Updated RTL to $currentRTLcommit"
+  else
+    echo "# Unknown option: $updateOption"
+  fi
+
+  echo
+  echo "# Starting the ${systemdService} service ... "
+  sudo systemctl restart ${systemdService}
+  exit 0
+fi
 
 echo "# FAIL - Unknown Parameter $1"
 echo "# may need reboot to run normal again"