Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-24 00:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge conflict resolution

Browse source
This commit is contained in:
nate 2016-03-28 13:07:51 -05:00
parent eaf89995ee
commit f2150ee7e1
4 changed files with 2 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

49
advanced/Scripts/blacklist.sh
View file

@ -51,19 +51,10 @@ fi
function HandleOther(){
#check validity of domain
<<<<<<< HEAD
validDomain=$(echo $1 | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
if [ -z "$validDomain" ]; then
echo $1 is not a valid argument or domain name
else
=======
validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
if [ -z "$validDomain" ]; then
echo "$1" is not a valid argument or domain name
else
>>>>>>> ScriptCleanup-Dev
domList=("${domList[@]}" $validDomain)
fi
}
@ -73,16 +64,9 @@ function PopBlacklistFile(){
if [[ ! -f $blacklist ]];then
touch $blacklist
fi
<<<<<<< HEAD
for dom in "${domList[@]}"
do
if $addmode; then
AddDomain $dom
=======
for dom in "${domList[@]}"; do
if "$addmode"; then
AddDomain "$dom"
>>>>>>> ScriptCleanup-Dev
else
RemoveDomain "$dom"
fi
@ -134,18 +118,6 @@ function ModifyHostFile(){
numberOf=$($blacklist | sed '/^\s*$/d' | wc -l)
plural=; [[ "$numberOf" != "1" ]] && plural=s
echo ":::"
<<<<<<< HEAD
echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."
if [[ -n $piholeIPv6 ]];then
cat $blacklist | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
else
cat $blacklist | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList
fi
fi
else
=======
echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."
if [[ -n $piholeIPv6 ]];then
$blacklist | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
@ -154,22 +126,10 @@ function ModifyHostFile(){
fi
fi
else
>>>>>>> ScriptCleanup-Dev
echo ":::"
for dom in "${domToRemoveList[@]}"
for dom in "${domToRemoveList[@]}"
do
#we need to remove the domains from the blacklist file and the host file
<<<<<<< HEAD
echo "::: $dom"
echo -n "::: removing from HOSTS file..."
echo $dom | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' $adList
echo " done!"
echo -n "::: removing from blackist.txt..."
echo $dom | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $blacklist
echo " done!"
done
fi
=======
echo "::: $dom"
echo -n "::: removing from HOSTS file..."
echo "$dom" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' $adList
@ -179,8 +139,6 @@ function ModifyHostFile(){
echo " done!"
done
fi
>>>>>>> ScriptCleanup-Dev
}
function Reload() {
@ -208,13 +166,8 @@ do
"-nr"| "--noreload" ) reload=false;;
"-d" | "--delmode" ) addmode=false;;
"-f" | "--force" ) force=true;;
<<<<<<< HEAD
"-q" | "--quiet" ) versbose=false;;
* ) HandleOther $var;;
=======
"-q" | "--quiet" ) versbose=false;;
* ) HandleOther "$var";;
>>>>>>> ScriptCleanup-Dev
esac
done

11
advanced/Scripts/whitelist.sh
View file

@ -51,13 +51,7 @@ fi
function HandleOther(){
#check validity of domain
<<<<<<< HEAD
validDomain=$(echo $1 | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
=======
validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
>>>>>>> ScriptCleanup-Dev
if [ -z "$validDomain" ]; then
echo "::: $1 is not a valid argument or domain name"
else
@ -186,13 +180,8 @@ do
"-nr"| "--noreload" ) reload=false;;
"-d" | "--delmode" ) addmode=false;;
"-f" | "--force" ) force=true;;
<<<<<<< HEAD
"-q" | "--quiet" ) versbose=false;;
* ) HandleOther $var;;
=======
"-q" | "--quiet" ) versbose=false;;
* ) HandleOther "$var";;
>>>>>>> ScriptCleanup-Dev
esac
done