From 15342f382bcad234b5367c692c63fea3b6cd69af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Sun, 21 Feb 2021 21:04:08 +0100 Subject: [PATCH] Remove CR and convert to lowercase inside the transformation method --- hblock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hblock b/hblock index 4b1d227..c404adf 100755 --- a/hblock +++ b/hblock @@ -338,7 +338,9 @@ hostsToDomains() { domainRegex='\([0-9a-z_-]\{1,63\}\.\)\{1,\}[a-z][0-9a-z_-]\{1,62\}' ipv4HostRegex='^[[:blank:]]*\('"${ipv4Regex:?}"'[[:blank:]]\{1,\}\)\{0,1\}'"${domainRegex:?}"'[[:blank:]]*\(#.*\)\{0,1\}$' ipv6HostRegex='^[[:blank:]]*\('"${ipv6Regex:?}"'[[:blank:]]\{1,\}\)\{0,1\}'"${domainRegex:?}"'[[:blank:]]*\(#.*\)\{0,1\}$' - grep -e "${ipv4HostRegex:?}" -e "${ipv6HostRegex:?}" | sed -e 's/[[:blank:]]*\(#.*\)\{0,1\}$//;s/^.*[[:blank:]]\{1,\}//' + removeCR | toLowercase \ + | grep -e "${ipv4HostRegex:?}" -e "${ipv6HostRegex:?}" \ + | sed -e 's/[[:blank:]]*\(#.*\)\{0,1\}$//;s/^.*[[:blank:]]\{1,\}//' } # Remove reserved Top Level Domains. @@ -571,7 +573,7 @@ main() { # If the blocklist file is not empty, it is sanitized. if [ -s "${blocklistFile:?}" ]; then printInfo 'Sanitizing blocklist' - removeCR < "${blocklistFile:?}" | toLowercase | hostsToDomains "${lenient:?}" | removeReservedTLDs > "${blocklistFile:?}.aux" \ + hostsToDomains "${lenient:?}" < "${blocklistFile:?}" | removeReservedTLDs > "${blocklistFile:?}.aux" \ && mv -f -- "${blocklistFile:?}.aux" "${blocklistFile:?}" fi