#293 .info before .conf

This commit is contained in:
rootzoll 2019-02-02 23:49:04 +01:00
parent a5b0f54233
commit b29c65a72a
24 changed files with 43 additions and 15 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,7 @@
#!/bin/bash #!/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 source /mnt/hdd/raspiblitz.conf
# make sure qrcode-encoder in installed # make sure qrcode-encoder in installed

View file

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

View file

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -5,7 +5,8 @@ _error="./.error.out"
echo "please wait ..." echo "please wait ..."
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -3,7 +3,8 @@ _temp="./download/dialog.$$"
_error="./.error.out" _error="./.error.out"
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -4,7 +4,8 @@ _error="./.error.out"
sudo chmod 7777 ${_error} sudo chmod 7777 ${_error}
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -3,7 +3,8 @@ _temp="./download/dialog.$$"
_error="./.error.out" _error="./.error.out"
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -3,7 +3,8 @@ _temp="./download/dialog.$$"
_error="./.error.out" _error="./.error.out"
# load raspiblitz config data (with backup from old config) # 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=`cat .network`; fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then

View file

@ -6,7 +6,8 @@
source /home/admin/_version.info source /home/admin/_version.info
## get basic info (its OK if not set yet) ## 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 # for old nodes
if [ ${#network} -eq 0 ]; then if [ ${#network} -eq 0 ]; then

View file

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

View file

@ -18,7 +18,8 @@ fi
_temp="./dialog.$$" _temp="./dialog.$$"
# load raspiblitz config (if available) # 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 if [ ${#network} -eq 0 ]; then
network="bitcoin" network="bitcoin"
fi fi

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -15,9 +15,10 @@ fi
# check and load raspiblitz config # check and load raspiblitz config
# to know which network is running # 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 if [ ${#network} -eq 0 ]; then
echo "FAIL - missing /mnt/hdd/raspiblitz.conf" echo "FAIL - missing network info"
exit 1 exit 1
fi fi

View file

@ -9,7 +9,8 @@ fi
# check and load raspiblitz config # check and load raspiblitz config
# to know which network is running # 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 if [ ${#network} -eq 0 ]; then
echo "FAIL - missing /mnt/hdd/raspiblitz.conf" echo "FAIL - missing /mnt/hdd/raspiblitz.conf"
exit 1 exit 1