Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move dnsmasq check into FTLcheckUpdate

Browse source 
Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2018-04-30 23:50:35 +01:00
parent 68d7337f98
commit e946a35b18
No known key found for this signature in database
GPG key ID: F5410858022DA5EB
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
automated install/basic-install.sh
View file

@ -1971,6 +1971,11 @@ FTLcheckUpdate()
local remoteSha1 local remoteSha1
local localSha1 local localSha1
# if dnsmasq is running at this point, force reinstall of FTL Binary
if check_service_active "dnsmasq";then
return 1
fi
if [[ ! "${ftlBranch}" == "master" ]]; then if [[ ! "${ftlBranch}" == "master" ]]; then
if [[ ${ftlLoc} ]]; then if [[ ${ftlLoc} ]]; then
# We already have a pihole-FTL binary downloaded. # We already have a pihole-FTL binary downloaded.
@ -2022,11 +2027,6 @@ FTLdetect() {
echo "" echo ""
echo -e " ${INFO} FTL Checks..." echo -e " ${INFO} FTL Checks..."
# if dnsmasq is running at this point, force reinstall of FTL Binary
if check_service_active "dnsmasq";then
FTLinstall "${binary}" || return 1
fi
if FTLcheckUpdate ; then if FTLcheckUpdate ; then
FTLinstall "${binary}" || return 1 FTLinstall "${binary}" || return 1
fi fi