Merge pull request #249 from pi-hole/OperationBlockListFromGravity

Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades
This commit is contained in:
Adam Warner 2016-01-29 19:39:11 +00:00
commit 6b50ea6504
3 changed files with 36 additions and 16 deletions

View file

@ -441,9 +441,9 @@ installCron(){
runGravity(){
$SUDO echo ":::"
$SUDO echo "::: Preparing to run gravity.sh to refresh hosts..."
$SUDO echo "::: Preparing to run gravity.sh to refresh hosts..."
if ls /etc/pihole/list* 1> /dev/null 2>&1; then
echo "::: Cleaning up previous install (preserving whitelist/blacklist)"
echo "::: Cleaning up previous install (preserving whitelist/blacklist)"
$SUDO rm /etc/pihole/list.*
fi
#Don't run as SUDO, this was causing issues