fix(v2): Patch dos2unix conversion and domain greping

Author: T145

docker/Dockerfile

@@ -244,9 +244,6 @@ WORKDIR /root
 RUN find -P -O3 /var/log -depth -type f -print0 | xargs -0 -r truncate -s 0; \
     find -P -O3 /etc/ /usr/ -type d -empty -delete
 
-RUN printf '#!/bin/sh\nset -eu\nquiet=false\nwhile [ "$#" -gt 0 ]; do\n  case "$1" in\n    -q) quiet=true; shift ;;\n    --) shift; break ;;\n    -*)\n      printf "dos2unix: unsupported option %%s\\\\n" "$1" >&2\n      exit 1\n      ;;\n    *)\n      break\n  esac\ndone\nif [ "$#" -eq 0 ]; then\n  mawk '\''sub(/\r\n?/, ""); print'\''\nelse\n  for file in "$@"; do\n    tmp=$(mktemp)\n    mawk '\''sub(/\r\n?/, ""); print'\'' "$file" >"$tmp"\n    mv "$tmp" "$file"\n  done\nfi\n' > /usr/local/bin/dos2unix && \
-    chmod +x /usr/local/bin/dos2unix
-
 RUN install -d -m 0700 /home/nonroot/.parallel && \
     cp /root/.parallel/will-cite /home/nonroot/.parallel/will-cite && \
     cp -r /root/.config /home/nonroot/.config && \

scripts/v2/apply_filters.bash

@@ -3,7 +3,7 @@
 # https://unix.stackexchange.com/questions/459127/grep-to-extract-lines-that-contains-full-domain-names-from-a-file
 # IpInfo's 'grepdomain' includes IPv4 addresses
 get_domains() {
-	grep -P "^.[^.]+\.[a-zA-Z]{3}$|^.[^.]+\.[a-zA-Z]{2}\.[a-zA-Z]{2}$"
+	grep -E "^.[^.]+\.[a-zA-Z]{3}$|^.[^.]+\.[a-zA-Z]{2}\.[a-zA-Z]{2}$"
 }
 
 # NOTE: "include-cidrs" ignores CIDR blocks!
@@ -91,7 +91,7 @@ process_list() {
 	'ESOX_LUCIUS') unzip -p "$FILE_PATH" 'PiHoleblocklists-main/*' -x PiHoleblocklists-main/LICENSE PiHoleblocklists-main/README.md ;;
 	'PENGELANA') unzip -p "$FILE_PATH" 'blocklist-master/src/blacklist/blocklists-*.txt' ;;
 	esac |
-		dos2unix -q |
+		tr -d '\r' |
 		case "$CONTENT_TYPE" in
 		'TEXT')
 			case "$LIST_FILTER" in