From 8427dcb42ea0f2b977449bd9a151a3f7e4cffb8c Mon Sep 17 00:00:00 2001
From: openoms <43343391+openoms@users.noreply.github.com>
Date: Tue, 30 Nov 2021 12:46:31 +0000
Subject: [PATCH] update c-lightning to v0.10.2 (#2707)

do not offer updates to release candidates for LND and CL
fix #2706
---
 CHANGES.md                              |  1 +
 home.admin/config.scripts/cl.update.sh  |  8 ++++----
 home.admin/config.scripts/lnd.update.sh | 20 +++++++++-----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a8f9a7fd0..2a1c2b940 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 ## What's new in Version 1.7.2 of RaspiBlitz?
 
 - New: Verify git commits and tags everywhere possible [issue](https://github.com/rootzoll/raspiblitz/issues/2686)
+- Update: C-lightning v0.10.2 [details](https://github.com/ElementsProject/lightning/releases/tag/v0.10.2)
 - Update: BTCPayServer v1.3.3 with UPDATE option [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.3.3)
 - Update: Electrum Server in Rust (electrs) v0.9.2 [details](https://github.com/romanz/electrs/blob/v0.9.2/RELEASE-NOTES.md)
 - Update: JoinMarket v0.9.3 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.9.2)
diff --git a/home.admin/config.scripts/cl.update.sh b/home.admin/config.scripts/cl.update.sh
index 3e516ea99..29c466f32 100644
--- a/home.admin/config.scripts/cl.update.sh
+++ b/home.admin/config.scripts/cl.update.sh
@@ -20,7 +20,7 @@ mode="$1"
 
 # RECOMMENDED UPDATE BY RASPIBLITZ TEAM
 # comment will be shown as "BEWARE Info" when option is choosen (can be multiple lines) 
-clUpdateVersion="0.10.1" # example: v0.10.1 .. keep empty if no newer version as sd card build is available
+clUpdateVersion="0.10.2" # example: 0.10.1 .. keep empty if no newer version as sd card build is available
 clUpdateComment="Please keep in mind that downgrading afterwards is not tested. Also not all additional apps are fully tested with the this update - but it looked good on first tests."
 
 # GATHER DATA
@@ -34,9 +34,9 @@ clInstalledVersionMinor=$(echo "${clInstalledVersion}" | cut -d "-" -f1 | cut -d
 # test if the installed version already the verified/recommended update version
 clUpdateInstalled=$(echo "${clInstalledVersion}" | grep -c "${clUpdateVersion}")
 
-# get latest release from C-lightning GitHub releases
-gitHubLatestReleaseJSON="$(curl -s https://api.github.com/repos/ElementsProject/lightning/releases | jq '.[0]')"
-clLatestVersion=$(echo "${gitHubLatestReleaseJSON}" | jq -r '.tag_name')
+# get latest release from C-lightning GitHub releases without release candidates
+clLatestVersion=$(curl -s https://api.github.com/repos/ElementsProject/lightning/releases | jq -r '.[].tag_name' | grep -v "rc" | head -n1)
+# example: v0.10.2
 
 # INFO
 if [ "${mode}" = "info" ]; then
diff --git a/home.admin/config.scripts/lnd.update.sh b/home.admin/config.scripts/lnd.update.sh
index 3ad0d5431..d7282c898 100755
--- a/home.admin/config.scripts/lnd.update.sh
+++ b/home.admin/config.scripts/lnd.update.sh
@@ -27,11 +27,6 @@ PGPauthor="roasbeef"
 lndUpdatePGPpkeys="https://keybase.io/roasbeef/pgp_keys.asc"
 lndUpdatePGPcheck="4AB7F8DA6FAEBB3B70B1F903BC13F65E2DC84465"
 
-#joostjager
-# PGPauthor="joostjager"
-# lndUpdatePGPpkeys="https://keybase.io/joostjager/pgp_keys.asc"
-# lndUpdatePGPcheck="D146D0F68939436268FA9A130E26BB61B76C4D3A"
-
 # bitconner 
 # PGPauthor="bitconner"
 # lndUpdatePGPpkeys="https://keybase.io/bitconner/pgp_keys.asc"
@@ -71,10 +66,13 @@ lndInstalledVersionMinor=$(echo "${lndInstalledVersion}" | cut -d "-" -f1 | cut
 # test if the installed version already the verified/recommended update version
 lndUpdateInstalled=$(echo "${lndInstalledVersion}" | grep -c "${lndUpdateVersion}")
 
-# get latest release from LND GitHub releases
-gitHubLatestReleaseJSON="$(curl -s https://api.github.com/repos/lightningnetwork/lnd/releases | jq '.[0]')"
-lndLatestVersion=$(echo "${gitHubLatestReleaseJSON}" | jq -r '.tag_name')
-lndLatestDownload=$(echo "${gitHubLatestReleaseJSON}" | grep "browser_download_url" | grep "linux-${cpuArchitecture}" | cut -d '"' -f4)
+# get latest release from LND GitHub releases (without release candidates)
+lndLatestVersion=$(curl -s https://api.github.com/repos/lightningnetwork/lnd/releases | jq -r '.[].tag_name' | grep -v "rc" | head -n1)
+# example: v0.13.3-beta
+binaryName="lnd-linux-${cpuArchitecture}-${lndLatestVersion}.tar.gz"
+# example: lnd-linux-arm64-v0.13.3-beta.tar.gz
+lndLatestDownload="https://github.com/lightningnetwork/lnd/releases/download/${lndLatestVersion}/${binaryName}"
+# example: https://github.com/lightningnetwork/lnd/releases/download/v0.13.3-beta/lnd-linux-arm64-v0.13.3-beta.tar.gz
 
 # INFO
 if [ "${mode}" = "info" ]; then
@@ -122,7 +120,7 @@ if [ "${mode}" = "verified" ]; then
   echo 
   echo "# clean & change into download directory"
   sudo rm -r ${downloadDir}/*
-  cd "${downloadDir}"
+  cd "${downloadDir}" || exit 1
 
   echo
   echo "# extract the SHA256 hash from the manifest file for the corresponding platform"
@@ -203,7 +201,7 @@ if [ "${mode}" = "reckless" ]; then
 
   # clean & change into download directory
   sudo rm -r ${downloadDir}/*
-  cd "${downloadDir}"
+  cd "${downloadDir}" || exit 1
 
   # download binary
   echo "# downloading binary"