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 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode

Browse source 
adlists.default no longer used. No need to reference it.
This commit is contained in:
Mark Drobnak 2018-04-06 00:17:45 -04:00 committed by GitHub
commit 331472b592
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
automated install/basic-install.sh
View file

@ -1390,22 +1390,8 @@ installCron() {
# Gravity is a very important script as it aggregates all of the domains into a single HOSTS formatted list, # Gravity is a very important script as it aggregates all of the domains into a single HOSTS formatted list,
# which is what Pi-hole needs to begin blocking ads # which is what Pi-hole needs to begin blocking ads
runGravity() { runGravity() {
echo ""
echo -e " ${INFO} Preparing to run gravity.sh to refresh hosts..."
# If cached lists exist,
if ls /etc/pihole/list* 1> /dev/null 2>&1; then
echo -e " ${INFO} Cleaning up previous install (preserving whitelist/blacklist)"
# remove them
rm /etc/pihole/list.*
fi
# If the default ad lists file exists,
if [[ ! -e /etc/pihole/adlists.default ]]; then
# copy it over from the local repo
cp ${PI_HOLE_LOCAL_REPO}/adlists.default /etc/pihole/adlists.default
fi
echo -e " ${INFO} Running gravity.sh"
# Run gravity in the current shell # Run gravity in the current shell
{ /opt/pihole/gravity.sh; } { /opt/pihole/gravity.sh --force; }
} }
# Check if the pihole user exists and create if it does not # Check if the pihole user exists and create if it does not