Merge pull request #468 from mayurkr/mayur-bugfix

fixed non execution of the function helpFunc

advanced/Scripts/blacklist.sh

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

advanced/Scripts/whitelist.sh

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