#1116 rename option secure to verified

This commit is contained in:
rootzoll 2020-04-28 20:55:09 +02:00
parent c23fae78ce
commit 62d25f4466
3 changed files with 15 additions and 15 deletions

2
FAQ.md
View File

@ -22,7 +22,7 @@ Beside many small improvements and changes, these are most important changes:
- New: Make it easier to Copy The Blockchain over Network from running Blitz
- New: Forwarding Fee Report on Main Menu
- New: Easy Setup of Auto-Backup of SCB to Dropbox
- New: LND Interims Updates (secure & reckless) [details](https://github.com/rootzoll/raspiblitz/issues/1116#issuecomment-619467148)
- New: LND Interims Updates (verified & reckless) [details](https://github.com/rootzoll/raspiblitz/issues/1116#issuecomment-619467148)
- New: Sync RaspiBlitz with your forked GitHub repo thru menu [details](FAQ.md#how-can-i-sync-a-branch-of-my-forked-github-with-my-local-raspiblitz)
- Removed: Clone Blockchain from second HDD (use CopyStation script)

View File

@ -185,7 +185,7 @@ lnd()
source <(sudo -u admin /home/admin/config.scripts/lnd.update.sh info)
# LND Update Options
OPTIONS=(SECURE "Optional LND update to ${lndUpdateVersion}" \
OPTIONS=(VERIFIED "Optional LND update to ${lndUpdateVersion}" \
RECKLESS "Experimental LND update to ${lndLatestVersion}"
)
@ -193,7 +193,7 @@ lnd()
clear
case $CHOICE in
SECURE)
VERIFIED)
if [ ${lndUpdateInstalled} -eq 1 ]; then
whiptail --title "ALREADY INSTALLED" --msgbox "The LND version ${lndUpdateVersion} is already installed." 8 30
exit 1
@ -209,7 +209,7 @@ Do you really want to update LND now?
exit 1
fi
error=""
source <(sudo -u admin /home/admin/config.scripts/lnd.update.sh secure)
source <(sudo -u admin /home/admin/config.scripts/lnd.update.sh verified)
if [ ${#error} -gt 0 ]; then
whiptail --title "ERROR" --msgbox "${error}" 8 30
else

View File

@ -3,9 +3,9 @@
# command info
if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
echo "Interim optional LND updates between RaspiBlitz releases."
echo "lnd.update.sh [info|secure|reckless]"
echo "lnd.update.sh [info|verified|reckless]"
echo "info -> get actual state and possible actions"
echo "secure -> only do recommended updates by RaspiBlitz team"
echo "verified -> only do recommended updates by RaspiBlitz team"
echo " binary will be checked by signature and checksum"
echo "reckless -> if you just want to update to the latest release"
echo " published on LND GitHub releases (RC or final) without any"
@ -13,7 +13,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
exit 1
fi
# 1. parameter [info|secure|reckless]
# 1. parameter [info|verified|reckless]
mode="$1"
# RECOMMENDED UPDATE BY RASPIBLITZ TEAM
@ -64,7 +64,7 @@ lndInstalledVersionMajor=$(echo "${lndInstalledVersion}" | cut -d "-" -f1 | cut
lndInstalledVersionMain=$(echo "${lndInstalledVersion}" | cut -d "-" -f1 | cut -d "." -f2)
lndInstalledVersionMinor=$(echo "${lndInstalledVersion}" | cut -d "-" -f1 | cut -d "." -f3)
# test if the installed version already the secure/recommended update version
# test if the installed version already the verified/recommended update version
lndUpdateInstalled=$(echo "${lndInstalledVersion}" | grep -c "lndUpdateVersion")
# get latest release from LND GitHub releases
@ -82,7 +82,7 @@ if [ "${mode}" = "info" ]; then
echo "lndInstalledVersionMain='${lndInstalledVersionMain}'"
echo "lndInstalledVersionMinor='${lndInstalledVersionMinor}'"
echo "# the secure/recommended update option"
echo "# the verified/recommended update option"
echo "lndUpdateInstalled='${lndUpdateInstalled}'"
echo "lndUpdateVersion='${lndUpdateVersion}'"
echo "lndUpdateComment='${lndUpdateComment}'"
@ -94,13 +94,13 @@ if [ "${mode}" = "info" ]; then
exit 1
fi
# SECURE
if [ "${mode}" = "secure" ]; then
# verified
if [ "${mode}" = "verified" ]; then
echo "# lnd.update.sh secure"
echo "# lnd.update.sh verified"
# check for optional second parameter: forced update version
# --> only does the secure update if its the given version
# --> only does the verified update if its the given version
# this is needed for recovery/update.
fixedUpdateVersion="$2"
if [ ${#fixedUpdateVersion} -gt 0 ]; then
@ -201,8 +201,8 @@ if [ "${mode}" = "reckless" ]; then
lndInterimsUpdateNew="reckless"
fi
# JOINED INSTALL (SECURE & RECKLESS)
if [ "${mode}" = "secure" ] || [ "${mode}" = "reckless" ]; then
# JOINED INSTALL (verified & RECKLESS)
if [ "${mode}" = "verified" ] || [ "${mode}" = "reckless" ]; then
# install
echo "# stopping LND"