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-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #468 from mayurkr/mayur-bugfix

Browse source 
fixed non execution of the function helpFunc
This commit is contained in:
Adam Warner 2016-04-17 17:32:56 +01:00
commit b702c1d9a8
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
advanced/Scripts/blacklist.sh
View file

@ -10,9 +10,6 @@
# the Free Software Foundation, either version 2 of the License, or # the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
if [[ $# = 0 ]]; then
helpFunc
fi
#globals #globals
basename=pihole basename=pihole
@ -65,6 +62,10 @@ function helpFunc()
exit 1 exit 1
} }
if [[ $# = 0 ]]; then
helpFunc
fi
function HandleOther(){ function HandleOther(){
#check validity of domain #check validity of domain
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/')

7
advanced/Scripts/whitelist.sh
View file

@ -10,9 +10,6 @@
# the Free Software Foundation, either version 2 of the License, or # the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
if [[ $# = 0 ]]; then
helpFunc
fi
#globals #globals
basename=pihole basename=pihole
@ -64,6 +61,10 @@ function helpFunc()
exit 1 exit 1
} }
if [[ $# = 0 ]]; then
helpFunc
fi
function HandleOther(){ function HandleOther(){
#check validity of domain #check validity of domain
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/')