Merge pull request #962 from pi-hole/queryblacklist

Also query blacklist with pihole -q
2016-12-05 18:11:26 -05:00 · 2016-12-05 18:11:26 -05:00 · b6639d9e7e
parent f98de3d5db 74cb79252c
commit b6639d9e7e
1 changed files with 3 additions and 2 deletions
--- a/5
+++ b/5
@ -69,8 +69,9 @@ setupLCDFunction() {

 queryFunc() {
  domain="${2}"
-  for list in /etc/pihole/list.*; do
-    count=$(grep ${domain} $list | wc -l)
+  lists=( /etc/pihole/list.* /etc/pihole/blacklist.txt)
+  for list in ${lists[@]}; do
+    count=$(grep -c ${domain} $list)
    echo "::: ${list} (${count} results)"
    if [[ ${count} > 0 ]]; then
      grep ${domain} ${list}