Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 15:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Saved in Unix mode as oppsed to DOS..

Browse source
This commit is contained in:
Promofaux 2016-01-17 13:56:18 +00:00
parent e4f4488c9b
commit b4b7ae7405
1 changed files with 1 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
advanced/Scripts/blacklist.sh
View file

@ -1,46 +1,3 @@
<<<<<<< HEAD
#!/usr/bin/env bash
# (c) 2015 by Jacob Salmela
# This file is part of Pi-hole.
#
# Pi-hole is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
blackList=/etc/pihole/blacklist.txt
if [[ ! -f $blackList ]];then
touch $blackList
fi
if [[ $# = 0 ]]; then
echo "Immediately blacklists one or more domains."
echo "Usage: blacklist.sh domain1 [domain2 ...]"
fi
boolA=false
boolB=false
for var in "$@"
do
bool=false;
echo "Blacklisting $var..."
#add to whitelist.txt if it is not already there
grep -Ex -q "$var" $blackList || boolB=true
if $boolB; then
echo $var >> $blackList
boolA=true;
else
echo "$var Already in blacklist.txt"
fi
done
if $boolA; then
echo "New domains added to blacklist. Running gravity.sh"
/usr/local/bin/gravity.sh
else
echo "No need to update Hosts list, given domains already in blacklist"
fi
=======
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) 2015 by Jacob Salmela # (c) 2015 by Jacob Salmela
# This file is part of Pi-hole. # This file is part of Pi-hole.
@ -223,4 +180,3 @@ fi
if $reload; then if $reload; then
Reload Reload
fi fi
>>>>>>> upstream/master