From ac0936bfd85465510572afcbd67dc755096df86a Mon Sep 17 00:00:00 2001 From: rootzoll Date: Thu, 6 Dec 2018 18:36:34 +0100 Subject: [PATCH] fixed wrong ready state --- home.admin/00mainMenu.sh | 12 +----------- home.admin/_bootstrap.sh | 11 ++++++----- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh index 368fcdc..33aa0d0 100755 --- a/home.admin/00mainMenu.sh +++ b/home.admin/00mainMenu.sh @@ -143,7 +143,7 @@ if [ ${setupStep} -eq 0 ]; then DELETE "erase old data, keep blockchain, reboot" ) HEIGHT=11 else - + # start setup BACKTITLE="RaspiBlitz - Setup" TITLE="⚡ Welcome to your RaspiBlitz ⚡" @@ -152,16 +152,6 @@ if [ ${setupStep} -eq 0 ]; then LITECOIN "Setup LITECOIN and Lightning (EXPERIMENTAL)" ) HEIGHT=11 - # prepare values - valueExists=$(sudo cat ${infoFile} | grep -c 'network=') - if [ ${valueExists} -eq 0 ]; then - echo "network=bitcoin" >> ${infoFile} - fi - valueExists=$(sudo cat ${infoFile} | grep -c 'chain=') - if [ ${valueExists} -eq 0 ]; then - echo "chain=main" >> ${infoFile} - fi - fi diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index 56ab7e5..48eb104 100644 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -220,16 +220,17 @@ fi ################################ # init network and chain values if needed with defaults -valueExists=$(sudo cat /home/admin/raspiblitz.info 2>/dev/null | grep -c "network=") +valueExists=$(sudo cat ${infoFile} 2>/dev/null | grep -c "network=") if [ ${valueExists} -eq 0 ]; then - echo "network=bitcoin" >> /home/admin/raspiblitz.info + echo "network=bitcoin" >> ${infoFile} fi -valueExists=$(sudo cat /home/admin/raspiblitz.info 2>/dev/null | grep -c "chain=") +valueExists=$(sudo cat ${infoFile} 2>/dev/null | grep -c "chain=") if [ ${valueExists} -eq 0 ]; then - echo "chain=main" >> /home/admin/raspiblitz.info + echo "chain=main" >> ${infoFile} fi # EXIT on BOOTSTRAP HERE AT THE MOMENT echo "DONE BOOTSTRAP (before any configs etc)" >> $logFile -echo "state=ready" > $infoFile +sed -i "s/^state=.*/state=ready/g" ${infoFile} +sed -i "s/^message=.*/message='waiting login'/g" ${infoFile} exit 0 \ No newline at end of file