Merged branch development into PiHoleController

This commit is contained in:
nate 2016-04-01 12:17:41 -05:00
commit b80821c4b7
2 changed files with 2 additions and 2 deletions

View File

@ -115,7 +115,7 @@ function ModifyHostFile(){
if $addmode; then
#add domains to the hosts file
if [[ -r $blacklist ]];then
numberOf=$($blacklist | sed '/^\s*$/d' | wc -l)
numberOf=$(cat $blacklist | sed '/^\s*$/d' | wc -l)
plural=; [[ "$numberOf" != "1" ]] && plural=s
echo ":::"
echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."

View File

@ -120,7 +120,7 @@ function ModifyHostFile(){
#remove domains in from hosts file
if [[ -r $whitelist ]];then
# Remove whitelist entries
numberOf=$($whitelist | sed '/^\s*$/d' | wc -l)
numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
plural=; [[ "$numberOf" != "1" ]] && plural=s
echo ":::"
echo -n "::: Modifying HOSTS file to whitelist $numberOf domain${plural}..."