tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify nested if statements. 

Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2023-06-18 12:38:02 +01:00
parent 001f2012a2
commit d637d2a7a5
No known key found for this signature in database
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
automated install/basic-install.sh
View File

@ -1008,27 +1008,25 @@ remove_old_pihole_lighttpd_configs() {
local confenabled="/etc/lighttpd/conf-enabled/15-pihole-admin.conf"
if [[ -d "/etc/lighttpd/conf.d" ]]; then
if [[ -f "${lighttpdConfig}" ]]; then
sed -i '/include "\/etc\/lighttpd\/conf.d\/pihole-admin.conf"/d' "${lighttpdConfig}"
fi
if [[ -f "${condfd}" ]]; then
rm "${condfd}"
fi
if [[ -f "${condfd}" ]]; then
rm "${condfd}"
fi
if is_command lighty-disable-mod ; then
lighty-disable-mod pihole-admin > /dev/null || true
fi
elif [[ -d "/etc/lighttpd/conf-available" ]]; then
if is_command lighty-disable-mod ; then
lighty-disable-mod pihole-admin > /dev/null || true
fi
if [[ -f "${confavailable}" ]]; then
rm "${confavailable}"
fi
if [[ -f "${confavailable}" ]]; then
rm "${confavailable}"
fi
if [[ -f "${confenabled}" ]]; then
rm "${confenabled}"
fi
fi
if [[ -f "${confenabled}" ]]; then
rm "${confenabled}"
fi
}
# Clean an existing installation to prepare for upgrade/reinstall