diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh index cae9b7dd4..4cf7b2f47 100644 --- a/home.admin/00settingsMenuServices.sh +++ b/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 diff --git a/home.admin/20recoverDialog.sh b/home.admin/20recoverDialog.sh index 52ecd8947..d9cce91ca 100755 --- a/home.admin/20recoverDialog.sh +++ b/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 diff --git a/home.admin/80scanLND.sh b/home.admin/80scanLND.sh index 81c626372..f3ba72e98 100755 --- a/home.admin/80scanLND.sh +++ b/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) diff --git a/home.admin/97addMobileWallet.sh b/home.admin/97addMobileWallet.sh index 0d1992da4..0d5380574 100644 --- a/home.admin/97addMobileWallet.sh +++ b/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 diff --git a/home.admin/97addMobileWalletShango.sh b/home.admin/97addMobileWalletShango.sh index bff9ec535..3070efbe8 100644 --- a/home.admin/97addMobileWalletShango.sh +++ b/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 diff --git a/home.admin/97addMobileWalletZap.sh b/home.admin/97addMobileWalletZap.sh index f1161c18f..116db4701 100755 --- a/home.admin/97addMobileWalletZap.sh +++ b/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) diff --git a/home.admin/AAunlockLND.sh b/home.admin/AAunlockLND.sh index 6c37ff090..9698fca5e 100755 --- a/home.admin/AAunlockLND.sh +++ b/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 diff --git a/home.admin/BBcashoutWallet.sh b/home.admin/BBcashoutWallet.sh index c34f097d2..5766b294e 100755 --- a/home.admin/BBcashoutWallet.sh +++ b/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 diff --git a/home.admin/BBcloseAllChannels.sh b/home.admin/BBcloseAllChannels.sh index 5d06697af..af849a1a6 100755 --- a/home.admin/BBcloseAllChannels.sh +++ b/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 diff --git a/home.admin/BBconnectPeer.sh b/home.admin/BBconnectPeer.sh index f721e89d5..3d3b67c83 100755 --- a/home.admin/BBconnectPeer.sh +++ b/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 diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh index 797070c96..1f8fef864 100755 --- a/home.admin/BBcreateInvoice.sh +++ b/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 diff --git a/home.admin/BBfundWallet.sh b/home.admin/BBfundWallet.sh index 0278f2e7a..4e995f374 100755 --- a/home.admin/BBfundWallet.sh +++ b/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 diff --git a/home.admin/BBopenChannel.sh b/home.admin/BBopenChannel.sh index 559a59967..c0804dbe3 100755 --- a/home.admin/BBopenChannel.sh +++ b/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 diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh index f076bd21f..a11af795f 100755 --- a/home.admin/BBpayInvoice.sh +++ b/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 diff --git a/home.admin/XXdebugLogs.sh b/home.admin/XXdebugLogs.sh index 477d74fae..c494ac26e 100644 --- a/home.admin/XXdebugLogs.sh +++ b/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 diff --git a/home.admin/_background.sh b/home.admin/_background.sh index 03d31bc6e..21d2153f9 100644 --- a/home.admin/_background.sh +++ b/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" diff --git a/home.admin/config.scripts/blitz.setpassword.sh b/home.admin/config.scripts/blitz.setpassword.sh index 316b71e24..21cd62904 100644 --- a/home.admin/config.scripts/blitz.setpassword.sh +++ b/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 diff --git a/home.admin/config.scripts/bonus.rtl.sh b/home.admin/config.scripts/bonus.rtl.sh index edc9733ba..8bc918301 100755 --- a/home.admin/config.scripts/bonus.rtl.sh +++ b/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" diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh index 3c331f7d9..9749e5bc3 100755 --- a/home.admin/config.scripts/internet.tor.sh +++ b/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" diff --git a/home.admin/config.scripts/lnd.autonat.sh b/home.admin/config.scripts/lnd.autonat.sh index fe228864a..f87eae12f 100644 --- a/home.admin/config.scripts/lnd.autonat.sh +++ b/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 diff --git a/home.admin/config.scripts/lnd.autopilot.sh b/home.admin/config.scripts/lnd.autopilot.sh index 8a74bcf99..42cbc051c 100644 --- a/home.admin/config.scripts/lnd.autopilot.sh +++ b/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 diff --git a/home.admin/config.scripts/lnd.export.sh b/home.admin/config.scripts/lnd.export.sh index 2ec06f430..020176654 100644 --- a/home.admin/config.scripts/lnd.export.sh +++ b/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 diff --git a/home.admin/config.scripts/network.chain.sh b/home.admin/config.scripts/network.chain.sh index 77323eb46..d10568b1f 100755 --- a/home.admin/config.scripts/network.chain.sh +++ b/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 diff --git a/home.admin/config.scripts/network.reindex.sh b/home.admin/config.scripts/network.reindex.sh index ee11705b6..881e75398 100755 --- a/home.admin/config.scripts/network.reindex.sh +++ b/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