Merge pull request #205 from PromoFaux/InstallScript

Clean /etc/pihole/list.* during `basic-install.sh` to set a baseline for install procedures. Fixes #195. Submitted by @PromoFaux.
This commit is contained in:
Dan Schaper 2016-01-19 16:21:49 -08:00
commit 7dfd9f0378

View file

@ -271,6 +271,15 @@ installCron(){
$SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron $SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
} }
tidyEtcPihole()
{
if ls /etc/pihole/list* 1> /dev/null 2>&1; then
echo "Cleaning up previous install"
$SUDO rm /etc/pihole/list.*
fi
}
installPihole() installPihole()
{ {
installDependencies installDependencies
@ -284,6 +293,7 @@ installConfigs
installWebAdmin installWebAdmin
installPiholeWeb installPiholeWeb
installCron installCron
tidyEtcPihole
$SUDO /usr/local/bin/gravity.sh $SUDO /usr/local/bin/gravity.sh
} }