Move dnsmasq check into FTLcheckUpdate

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

View File

@@ -1971,6 +1971,11 @@ FTLcheckUpdate()
local remoteSha1
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 [[ ${ftlLoc} ]]; then
# We already have a pihole-FTL binary downloaded.
@@ -2022,11 +2027,6 @@ FTLdetect() {
echo ""
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
FTLinstall "${binary}" || return 1
fi