Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages 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..." echo "Insufficient free space, exiting..."
exit 1 exit 1
fi fi
} }
@ -632,7 +630,6 @@ clean_existing() {
for script in "${old_files[@]}"; do for script in "${old_files[@]}"; do
rm -f "${clean_directory}${script}.sh" rm -f "${clean_directory}${script}.sh"
done done
} }
installScripts() { installScripts() {
@ -1011,7 +1008,6 @@ update_dialogs() {
echo "::: Cancel selected. Exiting..." echo "::: Cancel selected. Exiting..."
exit 1 exit 1
fi fi
} }
main() { main() {