Merge branch 'dev' into raspiblitz-dev

home.admin/40addHDD.sh

@@ -42,19 +42,23 @@ if [ ${existsHDD} -gt 0 ]; then
         sudo mount -a
         mountOK=$(df | grep -c /mnt/hdd)
         if [ ${mountOK} -eq 1 ]; then
+
           echo "OK - HDD is mounted"
 	        echo ""
 
           # init the RASPIBLITZ Config
-          source /home/admin/_version.info
           configFile="/mnt/hdd/raspiblitz.conf"
-          sudo touch $configFile
-          sudo chmod 777 ${configFile}
-          echo "# RASPIBLITZ CONFIG FILE" > $configFile
-          echo "raspiBlitzVersion='${codeVersion}'" >> $configFile
-          echo "network=${network}" >> $configFile
-          echo "chain=${chain}" >> $configFile
-          echo "hostname=${hostname}" >> $configFile
+          configExists=$(sudo ls ${configFile} | grep -c 'raspiblitz.conf')
+          if [ ${configExists} -eq 0 ]; then
+            source /home/admin/_version.info
+            sudo touch $configFile
+            sudo chmod 777 ${configFile}
+            echo "# RASPIBLITZ CONFIG FILE" > $configFile
+            echo "raspiBlitzVersion='${codeVersion}'" >> $configFile
+            echo "network=${network}" >> $configFile
+            echo "chain=${chain}" >> $configFile
+            echo "hostname=${hostname}" >> $configFile
+          fi
 
           # move SSH pub keys to HDD so that they survive an update
           echo "moving SSH pub keys to HDD"

home.admin/90finishSetup.sh

@@ -87,4 +87,4 @@ sudo apt-get update
 echo "OK - System is now up to date"
 
 # mark setup is done
-sudo sed -i "s/^setupStep=.*/setupStep=90/g" /home/admin/raspiblitz.info
+sudo sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info

home.admin/95finalSetup.sh

@@ -29,7 +29,7 @@ cp $logFile /home/admin/raspiblitz.setup.log
 echo "Setting the Name/Alias/Hostname .."
 sudo /home/admin/config.scripts/lnd.setname.sh ${hostname}
 
-# mark setup is done (100%)
+# mark setup is done
 sudo sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info
 
 clear

home.admin/_bootstrap.sh

@@ -53,7 +53,9 @@ echo "message=" >> $infoFile
 echo "network=${network}" >> $infoFile
 echo "chain=${chain}" >> $infoFile
 echo "setupStep=${setupStep}" >> $infoFile
-echo "hostname=${hostname}" >> $infoFile
+if [ "${setupStep}" != "100" ]; then
+  echo "hostname=${hostname}" >> $infoFile
+fi
 sudo chmod 777 ${infoFile}
 
 ################################

home.admin/config.scripts/internet.tor.sh

@@ -90,7 +90,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     echo "deb-src https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
     echo "OK"
     echo ""
-
+    
     echo "*** Updating System ***"
     sudo apt-get update
     echo ""