Refine regex filter generation

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2018-06-17 14:59:21 +02:00
parent c7afe3e9a4
commit 2809579dd7
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD

View file

@ -19,10 +19,10 @@ convert_wildcard_to_regex() {
local addrlines domains uniquedomains local addrlines domains uniquedomains
# Obtain wildcard domains from old file # Obtain wildcard domains from old file
addrlines="$(grep -oE "/.*/" ${wildcardFile})" addrlines="$(grep -oE "/.*/" ${wildcardFile})"
# Strip "/" from domain names # Strip "/" from domain names and convert "." to regex-compatible "\."
domains="$(sed 's/\///g;' <<< "${addrlines}")" domains="$(sed 's/\///g;s/\./\\./g' <<< "${addrlines}")"
# Remove repeated domains (may have been inserted two times due to A and AAAA blocking) # Remove repeated domains (may have been inserted two times due to A and AAAA blocking)
uniquedomains="$(uniq <<< "${domains}")" uniquedomains="$(uniq <<< "${domains}")"
# Automatically generate regex filters and remove old wildcards file # Automatically generate regex filters and remove old wildcards file
awk '{print "(^)|(\\.)"$0"$"}' <<< "${uniquedomains}" >> "${regexFile:?}" && rm "${wildcardFile}" awk '{print "((^)|(\\.))"$0"$"}' <<< "${uniquedomains}" >> "${regexFile:?}" && rm "${wildcardFile}"
} }