From a52a8bd0666bcfb602df5149ef53c09701ccf94a Mon Sep 17 00:00:00 2001 From: rootzoll Date: Fri, 21 May 2021 21:18:37 -0500 Subject: [PATCH] protect old data from deletion --- .../setup.scripts/dialogBlockchainLightning.sh | 2 +- home.admin/setup.scripts/dialogDeleteData.sh | 14 ++++++++++++++ home.admin/setup.scripts/setupDialogControl.sh | 12 ++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 home.admin/setup.scripts/dialogDeleteData.sh diff --git a/home.admin/setup.scripts/dialogBlockchainLightning.sh b/home.admin/setup.scripts/dialogBlockchainLightning.sh index 48a141dc9..f91b64f03 100644 --- a/home.admin/setup.scripts/dialogBlockchainLightning.sh +++ b/home.admin/setup.scripts/dialogBlockchainLightning.sh @@ -16,7 +16,7 @@ lightning="" # chose blockchain OPTIONS=() OPTIONS+=(BITCOIN "Setup BITCOIN Blockchain (BitcoinCore)") -OPTIONS+=(LITECOIN "Setup LITECOIN Blockchain") +OPTIONS+=(LITECOIN "Setup LITECOIN Blockchain (experimental)") CHOICE=$(dialog --clear \ --backtitle "RaspiBlitz ${codeVersion} - Setup" \ --title "⚡ Blockchain ⚡" \ diff --git a/home.admin/setup.scripts/dialogDeleteData.sh b/home.admin/setup.scripts/dialogDeleteData.sh new file mode 100644 index 000000000..4dbe4081c --- /dev/null +++ b/home.admin/setup.scripts/dialogDeleteData.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +whiptail --title " FORMATTING DATA DRVE " --yes-button "DELETE DATA" --no-button "CANCEL" --yesno "For fresh setup your data drive needs to be formatted, but there is old data on your HDD/SSD that could contain funds. + +Are you really sure that you want delete that old data? + " 10 65 + +if [ "$?" == "0" ]; then + # 0 --> delete data + exit 0 +else + # 1 --> cancel + exit 1 +fi \ No newline at end of file diff --git a/home.admin/setup.scripts/setupDialogControl.sh b/home.admin/setup.scripts/setupDialogControl.sh index 9aa6bdb31..1faf9a2e4 100755 --- a/home.admin/setup.scripts/setupDialogControl.sh +++ b/home.admin/setup.scripts/setupDialogControl.sh @@ -8,6 +8,9 @@ source /home/admin/raspiblitz.info # this key/value file contains the state during the setup process SETUPFILE="/var/cache/raspiblitz/temp/raspiblitz.setup" +# remember original setupphase +orgSetupPhase="${setupPhase}" + # init SETUPFILE & temp dir on mem drive sudo mkdir /var/cache/raspiblitz/temp sudo chown admin:admin /var/cache/raspiblitz/temp @@ -106,6 +109,15 @@ if [ "${setupPhase}" == "setup" ]; then # FRESH SETUP if [ "${menuresult}" == "0" ]; then + # if other data is on HDD/SSD from migration/recover warn on formatting drive + if [ "${orgSetupPhase}" != "${setupPhase}" ]; then + /home/admin/setup.scripts/dialogDeleteData.sh + if [ "$?" == "1" ]; then + # exit with 0 to restart process from outside loop + exit 0 + fi + fi + ############################################ # Choosing Blockchain & Lightning