Merge branch 'master' of https://github.com/pi-hole/pi-hole into dev

This commit is contained in:
arevindh 2018-12-11 08:44:10 +05:30
commit 12eca943d3
20 changed files with 741 additions and 588 deletions

File diff suppressed because it is too large Load diff

View file

@ -106,7 +106,7 @@ removeNoPurge() {
${SUDO} rm -rf /var/www/html/pihole &> /dev/null
${SUDO} rm -f /var/www/html/index.lighttpd.orig &> /dev/null
# If the web directory is empty after removing these files, then the parent html folder can be removed.
# If the web directory is empty after removing these files, then the parent html directory can be removed.
if [ -d "/var/www/html" ]; then
if [[ ! "$(ls -A /var/www/html)" ]]; then
${SUDO} rm -rf /var/www/html &> /dev/null