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-25 16:50: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

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