mirror of
https://github.com/moparisthebest/pi-hole
synced 2024-11-22 09:12:16 -05:00
Append ad list sources to latentWhitelist.txt to prevent them from being filtered.
Additional fixes for #35. This will prevent our own sources from being filtered out by competing source lists.
This commit is contained in:
parent
e464c04490
commit
a26377d229
20
gravity.sh
20
gravity.sh
@ -113,13 +113,21 @@ function gravity_advanced()
|
||||
if [[ -f $whitelist ]];then
|
||||
# Remove whitelist entries
|
||||
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
|
||||
echo -n "^$" > $latentWhitelist
|
||||
awk -F '[# \t]' 'NF>0&&$1!="" {print $1"$"}' $whitelist > $latentWhitelist
|
||||
cat $origin/$matter | grep -vwf $latentWhitelist > $origin/$andLight
|
||||
gravity_advanced
|
||||
else
|
||||
cat $origin/$matter > $origin/$andLight
|
||||
gravity_advanced
|
||||
rm $latentWhitelist
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user