#293 .info before .conf

home.admin/00settingsMenuServices.sh

@@ -2,7 +2,9 @@
 
 # get raspiblitz config
 echo "get raspiblitz config"
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
+
 echo "services default values"
 if [ ${#autoPilot} -eq 0 ]; then autoPilot="off"; fi
 if [ ${#autoUnlock} -eq 0 ]; then autoUnlock="off"; fi

home.admin/20recoverDialog.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 ## get basic info
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf 
 
 # show password info dialog

home.admin/80scanLND.sh

@@ -1,3 +1,6 @@
+#!/bin/bash
+
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
 
 ### USER PI AUTOSTART (LCD Display)

home.admin/97addMobileWallet.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # get raspiblitz config
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
 
 # check if dynamic domain is set

home.admin/97addMobileWalletShango.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-# load raspiblitz config data (with backup from old config)
+# load raspiblitz config data
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf 
 
 # make sure qrcode-encoder in installed

home.admin/97addMobileWalletZap.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # load raspiblitz config data
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf 
 
 # export go vars (if needed)

home.admin/AAunlockLND.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/BBcashoutWallet.sh

@@ -5,7 +5,8 @@ _error="./.error.out"
 echo "please wait ..."
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/BBcloseAllChannels.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/BBconnectPeer.sh

@@ -3,7 +3,8 @@ _temp="./download/dialog.$$"
 _error="./.error.out"
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/BBcreateInvoice.sh

@@ -4,7 +4,8 @@ _error="./.error.out"
 sudo chmod 7777 ${_error}
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/BBfundWallet.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/BBopenChannel.sh

@@ -3,7 +3,8 @@ _temp="./download/dialog.$$"
 _error="./.error.out"
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/BBpayInvoice.sh

@@ -3,7 +3,8 @@ _temp="./download/dialog.$$"
 _error="./.error.out"
 
 # load raspiblitz config data (with backup from old config)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then

home.admin/XXdebugLogs.sh

@@ -6,7 +6,8 @@
 source /home/admin/_version.info
 
 ## get basic info (its OK if not set yet)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 
 # for old nodes
 if [ ${#network} -eq 0 ]; then

home.admin/_background.sh

@@ -16,6 +16,8 @@ configFile="/mnt/hdd/raspiblitz.conf"
 configExists=$(ls ${configFile} | grep -c '.conf')
 if [ ${configExists} -eq 1 ]; then
     source ${configFile}
+else
+    source ${infoFile}
 fi
 
 echo "_background.sh STARTED"

home.admin/config.scripts/blitz.setpassword.sh

@@ -18,7 +18,8 @@ fi
 _temp="./dialog.$$"
 
 # load raspiblitz config (if available)
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then
   network="bitcoin"
 fi

home.admin/config.scripts/bonus.rtl.sh

@@ -9,6 +9,7 @@ fi
 
 # check and load raspiblitz config
 # to know which network is running
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then
  echo "FAIL - missing /mnt/hdd/raspiblitz.conf"

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

@@ -14,6 +14,7 @@ fi
 
 # check and load raspiblitz config
 # to know which network is running
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then
  echo "FAIL - missing /mnt/hdd/raspiblitz.conf"

home.admin/config.scripts/lnd.autonat.sh

@@ -27,6 +27,7 @@ echo "making sure services are not running"
 sudo systemctl stop lnd 2>/dev/null
 
 # add default value to raspi config if needed
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
 if [ ${#autoNatDiscovery} -eq 0 ]; then
   echo "autoNatDiscovery=off" >> /mnt/hdd/raspiblitz.conf

home.admin/config.scripts/lnd.autopilot.sh

@@ -28,6 +28,7 @@ if [ ${valueExists} -eq 0 ]; then
 fi
 
 # add default value to raspi config if needed
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
 if [ ${#autoPilot} -eq 0 ]; then
   echo "autoPilot=off" >> /mnt/hdd/raspiblitz.conf

home.admin/config.scripts/lnd.export.sh

@@ -42,7 +42,8 @@ if [ "$1" = "" ] || [ $# -eq 0 ]; then
 fi
 
 # load data from config
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 
 ########################
 # CANCEL

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

@@ -15,9 +15,10 @@ fi
 
 # check and load raspiblitz config
 # to know which network is running
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then
- echo "FAIL - missing /mnt/hdd/raspiblitz.conf"
+ echo "FAIL - missing network info"
  exit 1
 fi
 

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

@@ -9,7 +9,8 @@ fi
 
 # check and load raspiblitz config
 # to know which network is running
-source /mnt/hdd/raspiblitz.conf 2>/dev/null
+source /home/admin/raspiblitz.info
+source /mnt/hdd/raspiblitz.conf
 if [ ${#network} -eq 0 ]; then
  echo "FAIL - missing /mnt/hdd/raspiblitz.conf"
  exit 1