From 11bf41d3620a3f3163e248737005c3206df57ded Mon Sep 17 00:00:00 2001 From: rootzoll Date: Mon, 20 Sep 2021 21:20:20 +0200 Subject: [PATCH] #2264 remove DropBox Backup from menu --- CHANGES.md | 2 +- home.admin/00settingsMenuBasics.sh | 21 --------------------- home.admin/config.scripts/dropbox.upload.sh | 3 +++ 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 78cad5609..7ff51a39c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,13 +18,13 @@ - Update: BTC-RPC-Explorer v3.2.0 [details](https://github.com/janoside/btc-rpc-explorer/blob/master/CHANGELOG.md#v320) - Update: stacking-sats-kraken 0.4.4 [details](https://github.com/dennisreimann/stacking-sats-kraken/blob/master/README.md) - Update: BTCPayServer 1.2.3 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.2.3) - - Update: LND v0.13.1 [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.13.1-beta) - Update: RTL 0.11.2 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.11.2) - Update: Lightning Terminal v0.5.0-alpha [details](https://github.com/lightninglabs/lightning-terminal/releases/tag/v0.5.0-alpha) - Update: Pool CLI v0.5.1-alpha [details](https://github.com/lightninglabs/pool/releases/tag/v0.5.1-alpha) - Update: Balance of Satoshis 10.7.8 (BOS) + keep data on reinstall [details](https://github.com/alexbosworth/balanceofsatoshis/blob/master/CHANGELOG.md#version-8010) - Update: Circuitbreaker v0.3.0 [details](https://github.com/lightningequipment/circuitbreaker/blob/master/README.md) +- Remove: DropBox Backup (its recommended to change to Nextcloud Backup) ## What's new in Version 1.7.0 of RaspiBlitz? diff --git a/home.admin/00settingsMenuBasics.sh b/home.admin/00settingsMenuBasics.sh index 4d31211b2..9693dfc4d 100755 --- a/home.admin/00settingsMenuBasics.sh +++ b/home.admin/00settingsMenuBasics.sh @@ -31,10 +31,6 @@ if [ "${lightning}" == "cln" ] || [ "${cln}" == "on" ]; then clnNode="on" fi -echo "# map dropboxbackup to on/off" -DropboxBackup="off" -if [ ${#dropboxBackupTarget} -gt 0 ]; then DropboxBackup="on"; fi - echo "map nextcloudbackup to on/off" NextcloudBackup="off" if [ $nextcloudBackupServer ] && [ $nextcloudBackupUser ] && [ $nextcloudBackupPassword ]; then NextcloudBackup="on"; fi @@ -136,7 +132,6 @@ if [ "${lndNode}" == "on" ]; then OPTIONS+=(c '-LND Circuitbreaker (firewall)' ${circuitbreaker}) OPTIONS+=(u '-LND Auto-Unlock' ${autoUnlock}) OPTIONS+=(x '-LND StaticChannelBackup on Nextcloud' ${NextcloudBackup}) - OPTIONS+=(d '-LND StaticChannelBackup DropBox' ${DropboxBackup}) OPTIONS+=(e '-LND StaticChannelBackup USB Drive' ${LocalBackup}) OPTIONS+=(l '-LND UPnP (AutoNAT)' ${autoNatDiscovery}) fi @@ -323,22 +318,6 @@ else echo "Circuitbreaker Setting unchanged." fi -# LND DropBox process choice -choice="off"; check=$(echo "${CHOICES}" | grep -c "d") -if [ ${check} -eq 1 ]; then choice="on"; fi -if [ "${DropboxBackup}" != "${choice}" ] && [ "${lndNode}" == "on" ]; then - echo "DropBox Setting changed .." - anychange=1 - sudo -u admin /home/admin/config.scripts/dropbox.upload.sh ${choice} - if [ "${choice}" = "on" ]; then - # doing initial upload so that user can see result - source /mnt/hdd/raspiblitz.conf - sudo /home/admin/config.scripts/dropbox.upload.sh upload ${dropboxBackupTarget} /mnt/hdd/lnd/data/chain/${network}/${chain}net/channel.backup - fi -else - echo "Dropbox backup setting unchanged." -fi - # Nextcloud process choice choice="off"; check=$(echo "${CHOICES}" | grep -c "x") if [ ${check} -eq 1 ]; then choice="on"; fi diff --git a/home.admin/config.scripts/dropbox.upload.sh b/home.admin/config.scripts/dropbox.upload.sh index 94747f3bd..cd4d3a416 100755 --- a/home.admin/config.scripts/dropbox.upload.sh +++ b/home.admin/config.scripts/dropbox.upload.sh @@ -1,5 +1,8 @@ #!/bin/bash +# DEPRECATED: https://github.com/rootzoll/raspiblitz/issues/2264#issuecomment-872655605 +# script will stay on v1.7.1 ... but should be removed after that + # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo "# script to upload a file to DropBox (without third party libs)"