Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-04 12:03:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development' of https://github.com/pi-hole/pi-hole into alpine_support

Browse source
This commit is contained in:
Eric Warnke 2016-10-26 14:11:03 -04:00
commit 5a626cc66f
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gravity.sh
View file

@ -187,12 +187,16 @@ gravity_Schwarzchild() {
gravity_Blacklist() { gravity_Blacklist() {
# Append blacklist entries if they exist # Append blacklist entries if they exist
numBlacklisted=$(wc -l < "${blacklistFile}") if [[ -f "${blacklistFile}" ]]; then
plural=; [[ "$numBlacklisted" != "1" ]] && plural=s numBlacklisted=$(wc -l < "${blacklistFile}")
plural=; [[ "$numBlacklisted" != "1" ]] && plural=s
echo -n "::: BlackListing $numBlacklisted domain${plural}..."
cat ${blacklistFile} >> ${piholeDir}/${eventHorizon}
echo " done!"
else
echo "::: Nothing to blacklist!"
fi
echo -n "::: BlackListing $numBlacklisted domain${plural}..."
cat ${blacklistFile} >> ${piholeDir}/${eventHorizon}
echo " done!"
} }
gravity_Whitelist() { gravity_Whitelist() {
@ -209,15 +213,19 @@ gravity_Whitelist() {
done done
echo " done!" echo " done!"
# Ensure adlist domains are in whitelist.txt # Ensure adlist domains are in whitelist.txt
${whitelistScript} -nr -q "${urls[@]}" > /dev/null ${whitelistScript} -nr -q "${urls[@]}" > /dev/null
# Remove anything in whitelist.txt from the Event Horizon if [[ -f "${whitelistFile}" ]]; then
numWhitelisted=$(wc -l < "${whitelistFile}") # Remove anything in whitelist.txt from the Event Horizon
plural=; [[ "$numWhitelisted" != "1" ]] && plural=s numWhitelisted=$(wc -l < "${whitelistFile}")
echo -n "::: Whitelisting $numWhitelisted domain${plural}..." plural=; [[ "$numWhitelisted" != "1" ]] && plural=s
grep -F -x -v -f ${whitelistFile} ${piholeDir}/${preEventHorizon} > ${piholeDir}/${eventHorizon} echo -n "::: Whitelisting $numWhitelisted domain${plural}..."
echo " done!" grep -F -x -v -f ${whitelistFile} ${piholeDir}/${preEventHorizon} > ${piholeDir}/${eventHorizon}
echo " done!"
else
echo "::: Nothing to whitelist!"
fi
} }
gravity_unique() { gravity_unique() {