Merge pull request #2318 from pi-hole/tweak/wildcard-regex-format

Use simpler regex format for wildcards

advanced/Scripts/list.sh

@@ -141,7 +141,7 @@ AddDomain() {
         bool=true
         domain="${1}"
 
-        [[ "${wildcard}" == true ]] && domain="((^)|(\\.))${domain//\./\\.}$"
+        [[ "${wildcard}" == true ]] && domain="(^|\\.)${domain//\./\\.}$"
 
         # Is the domain in the list?
         # Search only for exactly matching lines
@@ -189,7 +189,7 @@ RemoveDomain() {
         [[ -z "${type}" ]] && type="--wildcard-only"
         domain="${1}"
 
-        [[ "${wildcard}" == true ]] && domain="((^)|(\\.))${domain//\./\\.}$"
+        [[ "${wildcard}" == true ]] && domain="(^|\\.)${domain//\./\\.}$"
 
         bool=true
         # Is it in the list?

advanced/Scripts/wildcard_regex_converter.sh

@@ -24,5 +24,5 @@ convert_wildcard_to_regex() {
     # Remove repeated domains (may have been inserted two times due to A and AAAA blocking)
     uniquedomains="$(uniq <<< "${domains}")"
     # Automatically generate regex filters and remove old wildcards file
-    awk '{print "((^)|(\\.))"$0"$"}' <<< "${uniquedomains}" >> "${regexFile:?}" && rm "${wildcardFile}"
+    awk '{print "(^|\\.)"$0"$"}' <<< "${uniquedomains}" >> "${regexFile:?}" && rm "${wildcardFile}"
 }