add back in str local var, and change ticks to info on whitelist lines

Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2017-12-18 20:14:53 +00:00
parent 5ecc46d85b
commit 2d3906450a
No known key found for this signature in database
GPG key ID: F5410858022DA5EB

View file

@ -419,7 +419,7 @@ gravity_Filter() {
# Whitelist unique blocklist domain sources # Whitelist unique blocklist domain sources
gravity_WhitelistBLD() { gravity_WhitelistBLD() {
local uniqDomains local uniqDomains str
echo "" echo ""
@ -432,7 +432,7 @@ gravity_WhitelistBLD() {
# Whitelist $uniqDomains # Whitelist $uniqDomains
"${PIHOLE_COMMAND}" -w -nr -q ${uniqDomains[*]} &> /dev/null "${PIHOLE_COMMAND}" -w -nr -q ${uniqDomains[*]} &> /dev/null
echo -e "${OVER} ${TICK} ${str}" echo -e "${OVER} ${INFO} ${str}"
} }
# Whitelist user-defined domains # Whitelist user-defined domains
@ -451,7 +451,7 @@ gravity_Whitelist() {
# Print everything from preEventHorizon into whitelistMatter EXCEPT domains in $whitelistFile # Print everything from preEventHorizon into whitelistMatter EXCEPT domains in $whitelistFile
grep -F -x -v -f "${whitelistFile}" "${piholeDir}/${preEventHorizon}" > "${piholeDir}/${whitelistMatter}" grep -F -x -v -f "${whitelistFile}" "${piholeDir}/${preEventHorizon}" > "${piholeDir}/${whitelistMatter}"
echo -e "${OVER} ${TICK} ${str}" echo -e "${OVER} ${INFO} ${str}"
} }
# Output count of blacklisted domains and wildcards # Output count of blacklisted domains and wildcards