moparisthebest/pi-hole
1
0
Fork 0
mirror of https://github.com/moparisthebest/pi-hole synced 2024-11-22 09:12:16 -05:00
Code Issues Releases Wiki Activity

Append ad list sources to latentWhitelist.txt to prevent them from being filtered.

Browse Source 
Additional fixes for #35. This will prevent our own sources from being
filtered out by competing source lists.
This commit is contained in:
korhadris 2015-08-22 21:44:41 -07:00
parent e464c04490
commit a26377d229
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gravity.sh
View File

@ -113,13 +113,21 @@ function gravity_advanced()
if [[ -f $whitelist ]];then if [[ -f $whitelist ]];then
# Remove whitelist entries # Remove whitelist entries
numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l) numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
echo "** Whitelisting $numberOf domain(s)..." plural=; [[ "$numberOf" != "1" ]] && plural=s
echo "** Whitelisting $numberOf domain${plural}..."
# Append a "$" to the end of each line so it can be parsed out with grep -w # Append a "$" to the end of each line so it can be parsed out with grep -w
echo -n "^$" > $latentWhitelist
awk -F '[# \t]' 'NF>0&&$1!="" {print $1"$"}' $whitelist > $latentWhitelist awk -F '[# \t]' 'NF>0&&$1!="" {print $1"$"}' $whitelist > $latentWhitelist
cat $origin/$matter | grep -vwf $latentWhitelist > $origin/$andLight
gravity_advanced
else else
cat $origin/$matter > $origin/$andLight rm $latentWhitelist
gravity_advanced
fi fi
# Prevent our sources from being pulled into the hole
plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
for url in ${sources[@]}
do
echo "$url" | awk -F '/' '{print $3"$"}' >> $latentWhitelist
done
grep -vwf $latentWhitelist $origin/$matter > $origin/$andLight
gravity_advanced