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

Merge pull request #2314 from pi-hole/fix/ftl-install-error-output

Browse Source 
Fix FTL install leaking error output
This commit is contained in:
Dan Schaper
2018-07-28 19:53:04 -07:00
committed by GitHub
parent 1844bf17a7 c73b5456eb
commit 6d671007dd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
automated install/basic-install.sh
View File

@ -1370,11 +1370,11 @@ check_service_active() {
# If systemctl exists, # If systemctl exists,
if command -v systemctl &> /dev/null; then if command -v systemctl &> /dev/null; then
# use that to check the status of the service # use that to check the status of the service
systemctl is-enabled "${1}" > /dev/null systemctl is-enabled "${1}" &> /dev/null
# Otherwise, # Otherwise,
else else
# fall back to service command # fall back to service command
service "${1}" status > /dev/null service "${1}" status &> /dev/null
fi fi
} }
@ -2058,7 +2058,7 @@ FTLinstall() {
# Install the FTL service # Install the FTL service
echo -e "${OVER} ${TICK} ${str}" echo -e "${OVER} ${TICK} ${str}"
# dnsmasq can now be stopped and disabled if it exists # dnsmasq can now be stopped and disabled if it exists
if which dnsmasq > /dev/null; then if which dnsmasq &> /dev/null; then
if check_service_active "dnsmasq";then if check_service_active "dnsmasq";then
echo " ${INFO} FTL can now resolve DNS Queries without dnsmasq running separately" echo " ${INFO} FTL can now resolve DNS Queries without dnsmasq running separately"
stop_service dnsmasq stop_service dnsmasq
@ -2187,7 +2187,7 @@ FTLcheckUpdate() {
local localSha1 local localSha1
# if dnsmasq exists and is running at this point, force reinstall of FTL Binary # if dnsmasq exists and is running at this point, force reinstall of FTL Binary
if which dnsmasq > /dev/null; then if which dnsmasq &> /dev/null; then
if check_service_active "dnsmasq";then if check_service_active "dnsmasq";then
return 0 return 0
fi fi