arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development' into cleanup/remove_legacy_detect

Browse Source 
Conflicts:
	automated install/basic-install.sh
This commit is contained in:
DL6ER 2016-12-21 12:01:58 +01:00
commit 9432d3035a
No known key found for this signature in database
GPG Key ID: BB8EC0BC77973A30
1 changed files with 742 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
automated install/basic-install.sh
View File

@ -242,9 +242,7 @@ verifyFreeDiskSpace() {
echo "Insufficient free space, exiting..."
exit 1
fi
}
@ -632,7 +630,6 @@ clean_existing() {
for script in "${old_files[@]}"; do
rm -f "${clean_directory}${script}.sh"
done
}
installScripts() {
@ -1011,7 +1008,6 @@ update_dialogs() {
echo "::: Cancel selected. Exiting..."
exit 1
fi
}
main() {