Merge branch 'development' into customblockpage

Conflicts:
	automated install/basic-install.sh
This commit is contained in:
DL6ER
2016-12-22 19:22:09 +01:00
9 changed files with 1015 additions and 844 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -136,7 +136,7 @@ removeNoPurge() {
fi
echo "::: Removing config files and scripts..."
package_check ${i} > /dev/null
package_check lighttpd > /dev/null
if [ $? -eq 1 ]; then
${SUDO} rm -rf /etc/lighttpd/ &> /dev/null
else