gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #789 from pi-hole/legacy_setupVars

Browse Source 
reflect name change of some of the variables in setupVars
This commit is contained in:
Dan Schaper
2016-10-15 11:41:58 -07:00
committed by GitHub
parent 23f7363c70 a6fa60868b
commit b5b240d0be
1 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
automated install/basic-install.sh
View File

@ -817,6 +817,11 @@ installPihole() {
} }
updatePihole() { updatePihole() {
# Refactoring of install script has changed the name of a couple of variables. Sort them out here.
sed -i 's/IPv4addr/IPv4_address/g' ${setupVars}
sed -i 's/piholeIPv6/IPv6_address/g' ${setupVars}
# Source ${setupVars} for use in the rest of the functions.
. ${setupVars}
# Install base files and web interface # Install base files and web interface
installScripts installScripts
installConfigs installConfigs
@ -868,7 +873,6 @@ update_dialogs(){
case ${UpdateCmd} in case ${UpdateCmd} in
Update) Update)
echo "::: Updating existing install" echo "::: Updating existing install"
. ${setupVars}
useUpdateVars=true useUpdateVars=true
;; ;;
Install) Install)