Merge pull request #1302 from pi-hole/fix/nowildcardlistfile

Check for existence of wildcard blocking list (query adlists)
pull/1312/head
DL6ER 7 years ago committed by DL6ER
parent 0fe64cf5cc
commit de6aaf18ab
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD

@ -127,17 +127,19 @@ queryFunc() {
done
# Scan for possible wildcard matches
local wildcards=($(processWildcards "${domain}"))
for domain in ${wildcards[@]}; do
result=$(scanList "\/${domain}\/" ${wildcardlist})
# Remove empty lines before couting number of results
count=$(sed '/^\s*$/d' <<< "$result" | wc -l)
if [[ ${count} > 0 ]]; then
echo "::: Wildcard blocking ${domain} (${count} results)"
echo "${result}"
echo ""
fi
done
if [ -e "${wildcardlist}" ]; then
local wildcards=($(processWildcards "${domain}"))
for domain in ${wildcards[@]}; do
result=$(scanList "\/${domain}\/" ${wildcardlist})
# Remove empty lines before couting number of results
count=$(sed '/^\s*$/d' <<< "$result" | wc -l)
if [[ ${count} > 0 ]]; then
echo "::: Wildcard blocking ${domain} (${count} results)"
echo "${result}"
echo ""
fi
done
fi
exit 0
}

Loading…
Cancel
Save