|
|
|
@ -417,24 +417,6 @@ gravity_SortAndFilterConsolidatedList() {
|
|
|
|
|
echo -e " ${INFO} Number of unique domains trapped in the Event Horizon: ${COL_BLUE}${num}${COL_NC}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Whitelist unique blocklist domain sources
|
|
|
|
|
gravity_WhitelistBlocklistSourceUrls() {
|
|
|
|
|
local uniqDomains str
|
|
|
|
|
|
|
|
|
|
echo ""
|
|
|
|
|
|
|
|
|
|
# Create array of unique $sourceDomains
|
|
|
|
|
mapfile -t uniqDomains <<< "$(awk '{ if(!a[$1]++) { print $1 } }' <<< "$(printf '%s\n' "${sourceDomains[@]}")")"
|
|
|
|
|
|
|
|
|
|
str="Number of blocklist source domains being added to the whitelist: ${#uniqDomains[@]}"
|
|
|
|
|
echo -ne " ${INFO} ${str}..."
|
|
|
|
|
|
|
|
|
|
# Whitelist $uniqDomains
|
|
|
|
|
"${PIHOLE_COMMAND}" -w -nr -q ${uniqDomains[*]} &> /dev/null
|
|
|
|
|
|
|
|
|
|
echo -e "${OVER} ${INFO} ${str}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Whitelist user-defined domains
|
|
|
|
|
gravity_Whitelist() {
|
|
|
|
|
local num str
|
|
|
|
@ -630,7 +612,6 @@ if [[ "${skipDownload}" == false ]]; then
|
|
|
|
|
gravity_SetDownloadOptions
|
|
|
|
|
gravity_ConsolidateDownloadedBlocklists
|
|
|
|
|
gravity_SortAndFilterConsolidatedList
|
|
|
|
|
gravity_WhitelistBlocklistSourceUrls
|
|
|
|
|
else
|
|
|
|
|
# Gravity needs to modify Blacklist/Whitelist/Wildcards
|
|
|
|
|
echo -e " ${INFO} Using cached Event Horizon list..."
|
|
|
|
|