From 88168842dca774743876a7373ce51bd7c2c078dd Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Mon, 10 Jun 2024 22:11:05 +0200 Subject: [PATCH] Adding Labelbase to menus & recover (#4620) --- CHANGES.md | 1 + home.admin/00mainMenu.sh | 6 ++++++ home.admin/00settingsMenuServices.sh | 17 +++++++++++++++++ home.admin/_provision_.sh | 9 +++++++++ 4 files changed, 33 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 2af1be0ff..973d2bf23 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ ## What's new in Version 1.11.1 of RaspiBlitz? - New: Set Timezone SSHMENU > SYSTEM > TIME [details](https://github.com/raspiblitz/raspiblitz/issues/1712) +- New: Labelbase 2.2.1 [details](https://x.com/labelbase_space) - Update: LNbits 0.12.8 [details](https://github.com/lnbits/lnbits/releases/tag/0.12.8) - Update: Specter Desktop 2.0.4 with reactivated UPDATE option [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v2.0.4) - Update: BTCPayServer 1.13.0 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.13.0) diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh index 047a2ac9f..5fc9bcf56 100755 --- a/home.admin/00mainMenu.sh +++ b/home.admin/00mainMenu.sh @@ -168,6 +168,9 @@ fi if [ "${fints}" == "on" ]; then OPTIONS+=(FINTS "Show FinTS/HBCI details") fi +if [ "${labelbase}" == "on" ]; then + OPTIONS+=(LABELBASE "Labelbase (UTXO labeling)") +fi # dont offer to switch to "testnet view for now" - so no wswitch back to mainnet needed #if [ ${chain} != "main" ]; then @@ -328,6 +331,9 @@ case $CHOICE in CIRCUITBREAKER) sudo /home/admin/config.scripts/bonus.circuitbreaker.sh menu ;; + LABELBASE) + sudo /home/admin/config.scripts/bonus.labelbase.sh menu + ;; FINTS) sudo /home/admin/config.scripts/bonus.fints.sh menu ;; diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh index 8d9d451d2..a3819a156 100755 --- a/home.admin/00settingsMenuServices.sh +++ b/home.admin/00settingsMenuServices.sh @@ -30,6 +30,7 @@ if [ ${#helipad} -eq 0 ]; then helipad="off"; fi if [ ${#lightningtipbot} -eq 0 ]; then lightningtipbot="off"; fi if [ ${#fints} -eq 0 ]; then fints="off"; fi if [ ${#lndk} -eq 0 ]; then lndk="off"; fi +if [ ${#labelbase} -eq 0 ]; then labelbase="off"; fi # show select dialog echo "run dialog ..." @@ -46,6 +47,7 @@ if [ "${network}" == "bitcoin" ]; then OPTIONS+=(ja 'BTC JoinMarket+JoininBox menu' ${joinmarket}) OPTIONS+=(za 'BTC Jam (JoinMarket WebUI)' ${jam}) OPTIONS+=(wa 'BTC Download Bitcoin Whitepaper' ${whitepaper}) + OPTIONS+=(ls 'BTC Labelbase' ${labelbase}) fi # available for both LND & c-lightning @@ -579,6 +581,21 @@ else echo "Whitepaper setting unchanged." fi +# labelbase process choice +choice="off"; check=$(echo "${CHOICES}" | grep -c "ls") +if [ ${check} -eq 1 ]; then choice="on"; fi +if [ "${labelbase}" != "${choice}" ]; then + echo "Labelbase setting changed .." + anychange=1 + sudo -u admin /home/admin/config.scripts/bonus.labelbase.sh ${choice} + source /mnt/hdd/raspiblitz.conf + if [ "${labelbase}" = "on" ]; then + sudo -u admin /home/admin/config.scripts/bonus.labelbase.sh menu + fi +else + echo "Labelbase setting unchanged." +fi + # fints process choice choice="off"; check=$(echo "${CHOICES}" | grep -c "fn") if [ ${check} -eq 1 ]; then choice="on"; fi diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh index 096b5af92..fc4e1e8ef 100755 --- a/home.admin/_provision_.sh +++ b/home.admin/_provision_.sh @@ -660,6 +660,15 @@ else echo "Provisioning LIT - keep default" >> ${logFile} fi +# labelbase +if [ "${labelbase}" = "on" ]; then + echo "Provisioning Labelbase - run config script" >> ${logFile} + /home/admin/_cache.sh set message "Setup Labelbase" + sudo -u admin /home/admin/config.scripts/bonus.labelbase.sh on >> ${logFile} 2>&1 +else + echo "Provisioning Labelbase - keep default" >> ${logFile} +fi + # lndg if [ "${lndg}" = "on" ]; then echo "Provisioning LNDg - run config script" >> ${logFile}