From 23afac142e2e6fe444f4bed0db82b006ab7a418a Mon Sep 17 00:00:00 2001 From: rootzoll Date: Wed, 27 Jul 2022 08:37:36 +0200 Subject: [PATCH] Core Lightning renamings --- FAQ.cl.md | 22 ++++++++-------- SECURITY.md | 2 +- home.admin/00parallelMainnetServices.sh | 2 +- home.admin/00parallelTestnetServices.sh | 2 +- home.admin/97addMobileWallet.sh | 2 +- home.admin/98repairMenu.sh | 4 +-- home.admin/99clMenu.sh | 6 ++--- home.admin/99clRepairMenu.sh | 6 ++--- home.admin/99systemMenu.sh | 6 ++--- home.admin/99updateMenu.sh | 26 +++++++++---------- home.admin/config.scripts/cl-plugin.backup.sh | 2 +- .../config.scripts/cl-plugin.feeadjuster.sh | 2 +- home.admin/config.scripts/cl-plugin.http.sh | 2 +- home.admin/config.scripts/cl-plugin.sparko.sh | 2 +- .../cl-plugin.standard-python.sh | 2 +- .../config.scripts/cl-plugin.summary.sh | 2 +- home.admin/config.scripts/cl.backup.sh | 4 +-- .../config.scripts/cl.install-service.sh | 2 +- home.admin/config.scripts/cl.rest.sh | 2 +- home.admin/config.scripts/cl.setname.sh | 4 +-- home.admin/config.scripts/cl.spark.sh | 2 +- home.admin/config.scripts/cl.update.sh | 12 ++++----- .../setup.scripts/controlFinalDialog.sh | 2 +- 23 files changed, 59 insertions(+), 59 deletions(-) diff --git a/FAQ.cl.md b/FAQ.cl.md index 1a227032..9424c3c0 100644 --- a/FAQ.cl.md +++ b/FAQ.cl.md @@ -707,7 +707,7 @@ Will need to pay through a peer which supports the onion messages which means yo + ./cl.install-service.sh -h - Script to set up or update the C-lightning systemd service + Script to set up or update the Core Lightning systemd service Usage: /home/admin/config.scripts/cl.install-service.sh @@ -732,7 +732,7 @@ Will need to pay through a peer which supports the onion messages which means yo cl.monitor.sh [mainnet|testnet|signet] wallet + ./cl-plugin.backup.sh -h - Install the backup plugin for C-lightning + Install the backup plugin for Core Lightning Replicates the lightningd.sqlite3 database on the SDcard Usage: @@ -762,7 +762,7 @@ Will need to pay through a peer which supports the onion messages which means yo + ./cl-plugin.feeadjuster.sh -h - Install the feeadjuster plugin for C-lightning + Install the feeadjuster plugin for Core Lightning Usage: cl-plugin.feeadjuster.sh [on|off] @@ -776,14 +776,14 @@ Will need to pay through a peer which supports the onion messages which means yo + ./cl-plugin.sparko.sh -h - Install, remove, connect or get info about the Sparko plugin for C-lightning + Install, remove, connect or get info about the Sparko plugin for Core Lightning version: v2.8 Usage: cl-plugin.sparko.sh [on|off|menu|connect] [testnet|mainnet|signet] [norestart] + ./cl-plugin.standard-python.sh -h - Install and show the output of the chosen plugin for C-lightning + Install and show the output of the chosen plugin for Core Lightning Usage: cl-plugin.standard-python.sh on [plugin-name] @@ -795,13 +795,13 @@ Will need to pay through a peer which supports the onion messages which means yo + ./cl-plugin.summary.sh -h - Install and show the output if the summary plugin for C-lightning + Install and show the output if the summary plugin for Core Lightning Usage: cl-plugin.summary.sh [testnet|mainnet|signet] [runonce] + ./cl.rest.sh -h - C-lightning-REST install script + Core Lightning-REST install script The default version is: v0.7.2 mainnet | testnet | signet instances can run parallel @@ -810,25 +810,25 @@ Will need to pay through a peer which supports the onion messages which means yo + ./cl.setname.sh -h - Config script to set the alias of the C-lightning node + Config script to set the alias of the Core Lightning node cl.setname.sh [mainnet|testnet|signet] [?newName] + ./cl.spark.sh -h - Install, remove or get info about the Spark Wallet for C-lightning + Install, remove or get info about the Spark Wallet for Core Lightning version: v0.3.1 Usage: cl.spark.sh [on|off|menu] + ./cl.update.sh -h - Interim optional C-lightning updates between RaspiBlitz releases. + Interim optional Core Lightning updates between RaspiBlitz releases. cl.update.sh [info|verified|reckless] info -> get actual state and possible actions verified -> only do recommended updates by RaspiBlitz team binary will be checked by signature and checksum reckless -> if you just want to update to the latest release - published on C-lightning GitHub releases (RC or final) without any + published on Core Lightning GitHub releases (RC or final) without any testing or security checks. ``` diff --git a/SECURITY.md b/SECURITY.md index 198f4514..82cf378f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -82,7 +82,7 @@ Some apps (like Fully Noded or JoinMarket) activate the Bitcoin core wallet and Please note that there is no perfect backup concept for the funds in your lightning channels yet. We strongly recommend using the `Static Channel Backup` provided by LND and consider off-line location backup of that file to have the best chances to recover Lightning funds in a case of recovering from a disaster. -The C-ligthning lightning.sqlite3 is replicated on the SDcard from the disk in real time. See more details in the [C-lightning FAQ](FAQ.cl.md#backups) +The C-ligthning lightning.sqlite3 is replicated on the SDcard from the disk in real time. See more details in the [Core Lightning FAQ](FAQ.cl.md#backups) For more practical information on this topic see: [Backup Channel Funds](README.md#backup-for-on-chain---channel-funds) diff --git a/home.admin/00parallelMainnetServices.sh b/home.admin/00parallelMainnetServices.sh index adbb6cad..13c71a8d 100644 --- a/home.admin/00parallelMainnetServices.sh +++ b/home.admin/00parallelMainnetServices.sh @@ -22,7 +22,7 @@ echo "run dialog ..." OPTIONS=() OPTIONS+=(l "LND on $CHAIN" ${lnd}) OPTIONS+=(r "RTL for LND $CHAIN" ${rtlWebinterface}) -OPTIONS+=(c "C-lightning on $CHAIN" ${cl}) +OPTIONS+=(c "Core Lightning on $CHAIN" ${cl}) OPTIONS+=(t "RTL for CL on $CHAIN" ${crtlWebinterface}) OPTIONS+=(s "Sparko for CL on $CHAIN" ${sparko}) OPTIONS+=(m "Spark for CL on $CHAIN" ${spark}) diff --git a/home.admin/00parallelTestnetServices.sh b/home.admin/00parallelTestnetServices.sh index 6f51ee86..86db70c0 100644 --- a/home.admin/00parallelTestnetServices.sh +++ b/home.admin/00parallelTestnetServices.sh @@ -22,7 +22,7 @@ echo "run dialog ..." OPTIONS=() OPTIONS+=(l "LND on $CHAIN" ${tlnd}) OPTIONS+=(r "RTL for LND $CHAIN" ${trtlWebinterface}) -OPTIONS+=(c "C-lightning on $CHAIN" ${tcl}) +OPTIONS+=(c "Core Lightning on $CHAIN" ${tcl}) OPTIONS+=(t "RTL for CL on $CHAIN" ${tcrtlWebinterface}) OPTIONS+=(s "Sparko for CL on $CHAIN" ${tsparko}) OPTIONS+=(m "Spark Wallet fro CL on $CHAIN" ${tspark}) diff --git a/home.admin/97addMobileWallet.sh b/home.admin/97addMobileWallet.sh index e3bed322..124fa555 100755 --- a/home.admin/97addMobileWallet.sh +++ b/home.admin/97addMobileWallet.sh @@ -80,7 +80,7 @@ if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ]; then fi if [ "${lightning}" == "cl" ] || [ "${cl}" == "on" ]; then - OPTIONS+=(ZEUS_CLREST "Zeus to C-lightningREST (Android or iOS)") + OPTIONS+=(ZEUS_CLREST "Zeus to Core LightningREST (Android or iOS)") OPTIONS+=(ZEUS_SPARK "Zeus to Sparko (Android or iOS)") OPTIONS+=(SPARK "Spark Wallet to Sparko (Android - EXPERIMENTAL)" ) OPTIONS+=(FULLYNODED_CL "Fully Noded to CL REST (iOS+Tor)") diff --git a/home.admin/98repairMenu.sh b/home.admin/98repairMenu.sh index 7b8627db..1a8c78bc 100755 --- a/home.admin/98repairMenu.sh +++ b/home.admin/98repairMenu.sh @@ -108,8 +108,8 @@ case $CHOICE in MIGRATION) if [ "${cl}" == "on" ] || [ "${cl}" == "1" ] && [ "${clEncryptedHSM}" != "on" ] ; then dialog \ - --title "Encrypt the C-lightning wallet" \ - --msgbox "\nWill proceed to encrypt and lock the C-lightning wallet to prevent it from starting automatically after the backup" 9 55 + --title "Encrypt the Core Lightning wallet" \ + --msgbox "\nWill proceed to encrypt and lock the Core Lightning wallet to prevent it from starting automatically after the backup" 9 55 sudo /home/admin/config.scripts/cl.hsmtool.sh encrypt mainnet fi if [ "${clAutoUnlock}" = "on" ]; then diff --git a/home.admin/99clMenu.sh b/home.admin/99clMenu.sh index ba94d9e4..7968d17a 100644 --- a/home.admin/99clMenu.sh +++ b/home.admin/99clMenu.sh @@ -16,7 +16,7 @@ BACKTITLE="RaspiBlitz" TITLE=" Core Lightning Options (${CHAIN})" MENU="" OPTIONS=() - OPTIONS+=(FUNDING "Fund the C-lightning wallet onchain") + OPTIONS+=(FUNDING "Fund the Core Lightning wallet onchain") OPTIONS+=(PEERING "Connect to a peer") OPTIONS+=(CHANNEL "Open a channel with peer") OPTIONS+=(SEND "Pay an invoice / payment request") @@ -33,9 +33,9 @@ if [ ${#openChannels} -gt 0 ] && [ ${openChannels} -gt 0 ]; then fi OPTIONS+=(CASHOUT "Withdraw all funds onchain ($CHAIN)") OPTIONS+=(SEED "Show Wallet Seed Words") - OPTIONS+=(REPAIR-CL "Repair options for C-lightning") + OPTIONS+=(REPAIR-CL "Repair options for Core Lightning") if [ "${lightning}" != "cl" ] && [ "${CHAIN}" == "mainnet" ]; then - OPTIONS+=(SWITCHLN "Use C-lightning as default") + OPTIONS+=(SWITCHLN "Use Core Lightning as default") fi CHOICE_HEIGHT=$(("${#OPTIONS[@]}/2+1")) diff --git a/home.admin/99clRepairMenu.sh b/home.admin/99clRepairMenu.sh index b7de2fd0..b86ab579 100644 --- a/home.admin/99clRepairMenu.sh +++ b/home.admin/99clRepairMenu.sh @@ -33,7 +33,7 @@ If left empty will start to rescan from the block 700000 (-700000). # BASIC MENU INFO WIDTH=64 BACKTITLE="RaspiBlitz" -TITLE="C-lightning repair options for $CHAIN" +TITLE="Core Lightning repair options for $CHAIN" MENU="" OPTIONS=() @@ -92,8 +92,8 @@ case $CHOICE in BACKUP) if [ "${cl}" == "on" ] || [ "${cl}" == "1" ] && [ "${clEncryptedHSM}" != "on" ]; then dialog \ - --title "Encrypt the C-lightning wallet" \ - --msgbox "\nWill proceed to encrypt and lock the C-lightning wallet to prevent it from starting automatically after the backup" 9 55 + --title "Encrypt the Core Lightning wallet" \ + --msgbox "\nWill proceed to encrypt and lock the Core Lightning wallet to prevent it from starting automatically after the backup" 9 55 sudo /home/admin/config.scripts/cl.hsmtool.sh encrypt mainnet fi if [ "${clAutoUnlock}" = "on" ]; then diff --git a/home.admin/99systemMenu.sh b/home.admin/99systemMenu.sh index 780a801f..fc6a7a54 100644 --- a/home.admin/99systemMenu.sh +++ b/home.admin/99systemMenu.sh @@ -126,10 +126,10 @@ case $CHOICE in then whiptail \ --title "Restart" --yes-button "Restart" --no-button "Not now" \ - --yesno "To apply the new settings C-lightning needs to restart. - Do you want to restart C-lightning now?" 0 0 + --yesno "To apply the new settings Core Lightning needs to restart. + Do you want to restart Core Lightning now?" 0 0 if [ $? -eq 0 ]; then - echo "# Restarting C-lightning" + echo "# Restarting Core Lightning" sudo systemctl restart ${netprefix}lightningd else echo "# Continue without restarting." diff --git a/home.admin/99updateMenu.sh b/home.admin/99updateMenu.sh index f8ab4c40..8b58078d 100755 --- a/home.admin/99updateMenu.sh +++ b/home.admin/99updateMenu.sh @@ -310,27 +310,27 @@ cl() # get cl info source <(sudo -u admin /home/admin/config.scripts/cl.update.sh info) - # C-lightning Update Options + # Core Lightning Update Options OPTIONS=() if [ ${clUpdateInstalled} -eq 0 ]; then - OPTIONS+=(VERIFIED "Optional C-lightning update to ${clUpdateVersion}") + OPTIONS+=(VERIFIED "Optional Core Lightning update to ${clUpdateVersion}") fi - OPTIONS+=(RECKLESS "Experimental C-lightning update to ${clLatestVersion}") + OPTIONS+=(RECKLESS "Experimental Core Lightning update to ${clLatestVersion}") - CHOICE=$(whiptail --clear --title "Update C-lightning Options" --menu "" 9 60 2 "${OPTIONS[@]}" 2>&1 >/dev/tty) + CHOICE=$(whiptail --clear --title "Update Core Lightning Options" --menu "" 9 60 2 "${OPTIONS[@]}" 2>&1 >/dev/tty) clear case $CHOICE in VERIFIED) if [ ${clUpdateInstalled} -eq 1 ]; then - whiptail --title "ALREADY INSTALLED" --msgbox "The C-lightning version ${clUpdateVersion} is already installed." 8 30 + whiptail --title "ALREADY INSTALLED" --msgbox "The Core Lightning version ${clUpdateVersion} is already installed." 8 30 exit 0 fi - whiptail --title "OPTIONAL C-lightning UPDATE" --yes-button "Cancel" --no-button "Update" --yesno "BEWARE on updating to C-lightning v${clUpdateVersion}: + whiptail --title "OPTIONAL Core Lightning UPDATE" --yes-button "Cancel" --no-button "Update" --yesno "BEWARE on updating to Core Lightning v${clUpdateVersion}: ${clUpdateComment} -Do you really want to update C-lightning now? +Do you really want to update Core Lightning now? " 16 58 if [ $? -eq 0 ]; then echo "# cancel update" @@ -342,20 +342,20 @@ Do you really want to update C-lightning now? if [ ${#error} -gt 0 ]; then whiptail --title "ERROR" --msgbox "${error}" 8 30 else - echo "# C-lightning was updated successfully" + echo "# Core Lightning was updated successfully" exit 0 fi ;; RECKLESS) - whiptail --title "RECKLESS C-lightning UPDATE to ${clLatestVersion}" --yes-button "Cancel" --no-button "Update" --yesno "Using the 'RECKLESS' C-lightning update will simply -grab the latest C-lightning release published on the C-lightning GitHub page (also release candidates). + whiptail --title "RECKLESS Core Lightning UPDATE to ${clLatestVersion}" --yes-button "Cancel" --no-button "Update" --yesno "Using the 'RECKLESS' Core Lightning update will simply +grab the latest Core Lightning release published on the Core Lightning GitHub page (also release candidates). There will be no security checks on signature, etc. This update mode is only recommended for testing and development nodes with no serious funding. -Do you really want to update C-lightning now? +Do you really want to update Core Lightning now? " 16 58 if [ $? -eq 0 ]; then echo "# cancel update" @@ -366,7 +366,7 @@ Do you really want to update C-lightning now? if [ ${#error} -gt 0 ]; then whiptail --title "ERROR" --msgbox "${error}" 8 30 else - echo "# C-lightning was updated successfully" + echo "# Core Lightning was updated successfully" exit 0 fi ;; @@ -469,7 +469,7 @@ if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ]; then fi if [ "${lightning}" == "cl" ] || [ "${cl}" == "on" ]; then - OPTIONS+=(CL "Interim C-lightning Update Options") + OPTIONS+=(CL "Interim Core Lightning Update Options") fi if [ "${bos}" == "on" ]; then diff --git a/home.admin/config.scripts/cl-plugin.backup.sh b/home.admin/config.scripts/cl-plugin.backup.sh index 8dbddb6e..6eff7030 100644 --- a/home.admin/config.scripts/cl-plugin.backup.sh +++ b/home.admin/config.scripts/cl-plugin.backup.sh @@ -2,7 +2,7 @@ function help(){ echo - echo "Install the backup plugin for C-lightning" + echo "Install the backup plugin for Core Lightning" echo "Replicates the lightningd.sqlite3 database on the SDcard" echo echo "Usage:" diff --git a/home.admin/config.scripts/cl-plugin.feeadjuster.sh b/home.admin/config.scripts/cl-plugin.feeadjuster.sh index 2628ead8..bcea6a91 100644 --- a/home.admin/config.scripts/cl-plugin.feeadjuster.sh +++ b/home.admin/config.scripts/cl-plugin.feeadjuster.sh @@ -3,7 +3,7 @@ # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ];then echo - echo "Install the feeadjuster plugin for C-lightning" + echo "Install the feeadjuster plugin for Core Lightning" echo "Usage:" echo "cl-plugin.feeadjuster.sh [on|off] " echo diff --git a/home.admin/config.scripts/cl-plugin.http.sh b/home.admin/config.scripts/cl-plugin.http.sh index d233f8cd..5590a0c6 100644 --- a/home.admin/config.scripts/cl-plugin.http.sh +++ b/home.admin/config.scripts/cl-plugin.http.sh @@ -62,7 +62,7 @@ https://github.com/Fonta1n3/FullyNoded/blob/master/Docs/Lightning.md#connect-ful sudo /home/admin/config.scripts/blitz.display.sh qr "${url}" clear echo " -C-lightning connection URL code for Fully Noded: +Core Lightning connection URL code for Fully Noded: The string shown is: $url " diff --git a/home.admin/config.scripts/cl-plugin.sparko.sh b/home.admin/config.scripts/cl-plugin.sparko.sh index c0062e5e..b84a06e8 100644 --- a/home.admin/config.scripts/cl-plugin.sparko.sh +++ b/home.admin/config.scripts/cl-plugin.sparko.sh @@ -9,7 +9,7 @@ SPARKOVERSION="v2.8" # command info if [ $# -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ];then echo - echo "Install, remove, connect or get info about the Sparko plugin for C-lightning" + echo "Install, remove, connect or get info about the Sparko plugin for Core Lightning" echo "version: $SPARKOVERSION" echo "Usage:" echo "cl-plugin.sparko.sh [on|off|menu|connect] [testnet|mainnet|signet] [norestart]" diff --git a/home.admin/config.scripts/cl-plugin.standard-python.sh b/home.admin/config.scripts/cl-plugin.standard-python.sh index 1d5b05e2..4bbf9f48 100644 --- a/home.admin/config.scripts/cl-plugin.standard-python.sh +++ b/home.admin/config.scripts/cl-plugin.standard-python.sh @@ -3,7 +3,7 @@ # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ];then echo - echo "Install and show the output of the chosen plugin for C-lightning" + echo "Install and show the output of the chosen plugin for Core Lightning" echo "Usage:" echo "cl-plugin.standard-python.sh on [plugin-name] " echo diff --git a/home.admin/config.scripts/cl-plugin.summary.sh b/home.admin/config.scripts/cl-plugin.summary.sh index 79abf75b..32dd0f62 100644 --- a/home.admin/config.scripts/cl-plugin.summary.sh +++ b/home.admin/config.scripts/cl-plugin.summary.sh @@ -3,7 +3,7 @@ # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ];then echo - echo "Install and show the output if the summary plugin for C-lightning" + echo "Install and show the output if the summary plugin forCore Lightning" echo "Usage:" echo "cl-plugin.summary.sh [testnet|mainnet|signet] [runonce]" echo diff --git a/home.admin/config.scripts/cl.backup.sh b/home.admin/config.scripts/cl.backup.sh index 6455f381..ff69cc47 100644 --- a/home.admin/config.scripts/cl.backup.sh +++ b/home.admin/config.scripts/cl.backup.sh @@ -427,7 +427,7 @@ if [ ${mode} = "seed-export-gui" ]; then ack=0 while [ ${ack} -eq 0 ] do - whiptail --title "IMPORTANT SEED WORDS - PLEASE WRITE DOWN" --msgbox "Created a new C-lightning wallet. Store these numbered 24 words in a safe location:\n\n${seedwords6x4}" 13 76 + whiptail --title "IMPORTANT SEED WORDS - PLEASE WRITE DOWN" --msgbox "Created a new Core Lightning wallet. Store these numbered 24 words in a safe location:\n\n${seedwords6x4}" 13 76 whiptail --title "Please Confirm" --yes-button "Show Again" --no-button "CONTINUE" --yesno " Are you sure that you wrote down the word list?" 8 55 if [ $? -eq 1 ]; then ack=1 @@ -466,7 +466,7 @@ if [ ${mode} = "seed-import-gui" ]; then sudo chown admin:admin /var/cache/raspiblitz/.seed.tmp # dialog to enter - dialog --backtitle "RaspiBlitz - Recover from C-lightning seed" --inputbox "Please enter/paste the SEED WORD LIST:\n(just the words, seperated by spaces, in correct order as numbered)" 9 78 2>/var/cache/raspiblitz/.seed.tmp + dialog --backtitle "RaspiBlitz - Recover from Core Lightning seed" --inputbox "Please enter/paste the SEED WORD LIST:\n(just the words, seperated by spaces, in correct order as numbered)" 9 78 2>/var/cache/raspiblitz/.seed.tmp wordstring=$(cat /var/cache/raspiblitz/.seed.tmp | sed 's/[^a-zA-Z0-9 ]//g') sudo shred -u /var/cache/raspiblitz/.seed.tmp 2>/dev/null echo "processing ..." diff --git a/home.admin/config.scripts/cl.install-service.sh b/home.admin/config.scripts/cl.install-service.sh index 7fb98820..98e79aac 100644 --- a/home.admin/config.scripts/cl.install-service.sh +++ b/home.admin/config.scripts/cl.install-service.sh @@ -3,7 +3,7 @@ # help if [ "$1" = "-h" ]||[ "$1" = "--help" ];then echo - echo "Script to set up or update the C-lightning systemd service" + echo "Script to set up or update the Core Lightning systemd service" echo "Usage:" echo "/home/admin/config.scripts/cl.install-service.sh " echo diff --git a/home.admin/config.scripts/cl.rest.sh b/home.admin/config.scripts/cl.rest.sh index f1968085..16b02042 100644 --- a/home.admin/config.scripts/cl.rest.sh +++ b/home.admin/config.scripts/cl.rest.sh @@ -6,7 +6,7 @@ CLRESTVERSION="v0.7.2" # help if [ $# -eq 0 ]||[ "$1" = "-h" ]||[ "$1" = "--help" ];then echo - echo "C-lightning-REST install script" + echo "Core-Lightning-REST install script" echo "The default version is: $CLRESTVERSION" echo "mainnet | testnet | signet instances can run parallel" echo diff --git a/home.admin/config.scripts/cl.setname.sh b/home.admin/config.scripts/cl.setname.sh index b3cd078b..e68acc15 100644 --- a/home.admin/config.scripts/cl.setname.sh +++ b/home.admin/config.scripts/cl.setname.sh @@ -3,7 +3,7 @@ # command info if [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo - echo "Config script to set the alias of the C-lightning node" + echo "Config script to set the alias of the Core Lightning node" echo "cl.setname.sh [mainnet|testnet|signet] [?newName]" echo exit 1 @@ -19,7 +19,7 @@ source <(/home/admin/config.scripts/network.aliases.sh getvars cl $1) if [ ${#newName} -eq 0 ]; then sudo rm ./.tmp - dialog --backtitle "Set CL Name/Alias" --inputbox "ENTER the new Name/Alias for the C-lightning node: + dialog --backtitle "Set CL Name/Alias" --inputbox "ENTER the new Name/Alias for the Core Lightning node: (free to choose, one word up to 32 basic characters) " 8 56 2>./.tmp newName=$( cat ./.tmp | tr -dc '[:alnum:]\n\r' ) diff --git a/home.admin/config.scripts/cl.spark.sh b/home.admin/config.scripts/cl.spark.sh index 142f0329..0cf87a6e 100644 --- a/home.admin/config.scripts/cl.spark.sh +++ b/home.admin/config.scripts/cl.spark.sh @@ -6,7 +6,7 @@ SPARKVERSION="v0.3.1" # command info if [ $# -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ];then echo - echo "Install, remove or get info about the Spark Wallet for C-lightning" + echo "Install, remove or get info about the Spark Wallet for Core Lightning" echo "version: $SPARKVERSION" echo "Usage:" echo "cl.spark.sh [on|off|menu] " diff --git a/home.admin/config.scripts/cl.update.sh b/home.admin/config.scripts/cl.update.sh index 81449c7b..e05f40aa 100644 --- a/home.admin/config.scripts/cl.update.sh +++ b/home.admin/config.scripts/cl.update.sh @@ -3,13 +3,13 @@ # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo - echo "Interim optional C-lightning updates between RaspiBlitz releases." + echo "Interim optional Core Lightning updates between RaspiBlitz releases." echo "cl.update.sh [info|verified|reckless]" echo "info -> get actual state and possible actions" 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 C-lightning GitHub releases (RC or final) without any" + echo " published on Core Lightning GitHub releases (RC or final) without any" echo " testing or security checks." echo exit 1 @@ -25,7 +25,7 @@ clUpdateComment="Please keep in mind that downgrading afterwards is not tested. # GATHER DATA -# installed C-lightning version +# installed Core Lightning version clInstalledVersion=$(sudo -u bitcoin lightning-cli --version) clInstalledVersionMajor=$(echo "${clInstalledVersion}" | cut -d "-" -f1 | cut -d "." -f1) clInstalledVersionMain=$(echo "${clInstalledVersion}" | cut -d "-" -f1 | cut -d "." -f2) @@ -34,7 +34,7 @@ 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 without release candidates +# get latest release from Core 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 @@ -52,7 +52,7 @@ if [ "${mode}" = "info" ]; then echo "clUpdateVersion='${clUpdateVersion}'" echo "clUpdateComment='${clUpdateComment}'" - echo "# reckless update option (latest C-lightning release from GitHub)" + echo "# reckless update option (latest Core Lightning release from GitHub)" echo "clLatestVersion='${clLatestVersion}'" exit 1 @@ -117,7 +117,7 @@ if [ "${mode}" = "verified" ] || [ "${mode}" = "reckless" ]; then echo "# flag update in raspiblitz config" /home/admin/config.scripts/blitz.conf.sh set clInterimsUpdate "${clInterimsUpdateNew}" - echo "# OK C-lightning is installed" + echo "# OK Core Lightning is installed" echo "# NOTE: RaspiBlitz may need to reboot now" exit 1 diff --git a/home.admin/setup.scripts/controlFinalDialog.sh b/home.admin/setup.scripts/controlFinalDialog.sh index c77491ae..f3044090 100755 --- a/home.admin/setup.scripts/controlFinalDialog.sh +++ b/home.admin/setup.scripts/controlFinalDialog.sh @@ -16,7 +16,7 @@ sudo chmod 777 /home/admin/raspiblitz.log if [ "${lightning}" == "lnd" ]; then walletName="LND" elif [ "${lightning}" == "cl" ]; then - walletName="C-lightning" + walletName="Core Lightning" fi if [ "${setupPhase}" == "setup" ] && [ "${seedwords6x4NEW}" != "" ]; then ack=0