Merge pull request #1320 from openoms/v1.6rc2-patch

fix Specter install freezing on recovery

home.admin/00settingsMenuServices.sh

@@ -142,11 +142,8 @@ if [ "${specter}" != "${choice}" ]; then
   errorOnInstall=$?
   if [ "${choice}" =  "on" ]; then
     if [ ${errorOnInstall} -eq 0 ]; then
-      #sudo sytemctl start cryptoadvance-specter
+      sudo systemctl start cryptoadvance-specter
       /home/admin/config.scripts/bonus.cryptoadvance-specter.sh menu
-      #whiptail --title " Installed Cryptoadvance Specter " --msgbox "\
-      #You should be able to reach specter on port 25441. The Login is Password B.\n
-      #" 14 50
     else
       l1="!!! FAIL on Cryptoadvance Specter install !!!"
       l2="Try manual install on terminal after reboot with:"

home.admin/config.scripts/bonus.cryptoadvance-specter.sh

@@ -227,7 +227,6 @@ EOF
 
     sudo mv /home/admin/cryptoadvance-specter.service /etc/systemd/system/cryptoadvance-specter.service
     sudo systemctl enable cryptoadvance-specter
-    sudo systemctl start cryptoadvance-specter
 
     echo "#    --> OK - the cryptoadvance-specter service is now enabled and started"
   else 

home.admin/config.scripts/network.wallet.sh

@@ -8,6 +8,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
 fi
 
 source /mnt/hdd/raspiblitz.conf
+source /home/admin/raspiblitz.info
 
 # add disablewallet with default value (0) to bitcoin.conf if missing
 if ! grep -Eq "^disablewallet=.*" /mnt/hdd/${network}/${network}.conf; then
@@ -50,14 +51,13 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   else
     echo "The ${network} core wallet is already on"    
   fi
-  if [ ${restartService} == 1 ]; then
+  if [ ${restartService} == 1 ] && [ ${state} != "recovering" ]; then
     echo "Restarting ${network}d"
     sudo systemctl restart ${network}d
   fi
   exit 0
 fi
 
-
 ###################
 # switch off
 ###################