truncate set name to avoid iptables v1.4.7: Maximum prefix length 29 for --log-prefix

manually handle compressed file only if no --compressed option was used
This commit is contained in:
Pawel Krawczyk 2015-01-12 13:45:28 +00:00
parent c526a31504
commit 307f13539d

View File

@ -72,13 +72,15 @@ for url in $urls; do
headers=$(mktemp) headers=$(mktemp)
# download the blocklist # download the blocklist
set_name=$(echo "$url" | awk -F/ '{print $3;}') # set name is derived from source URL hostname set_name=$(echo "$url" | awk -F/ '{print substring($3,0,21);}') # set name is derived from source URL hostname
curl -v -s ${COMPRESS_OPT} -k "$url" >"${unsorted_blocklist}" 2>"${headers}" curl -v -s ${COMPRESS_OPT} -k "$url" >"${unsorted_blocklist}" 2>"${headers}"
# this is required for blocklist.de that sends compressed content if asked for it or not # this is required for blocklist.de that sends compressed content if asked for it or not
if grep -qi 'content-encoding: gzip' "${headers}"; then if [ -z "$COMPRESS_OPT" ]; then
mv "${unsorted_blocklist}" "${unsorted_blocklist}.gz" if grep -qi 'content-encoding: gzip' "${headers}"; then
gzip -d "${unsorted_blocklist}.gz" mv "${unsorted_blocklist}" "${unsorted_blocklist}.gz"
gzip -d "${unsorted_blocklist}.gz"
fi
fi fi
sort -u <"${unsorted_blocklist}" | egrep "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >"${sorted_blocklist}" sort -u <"${unsorted_blocklist}" | egrep "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >"${sorted_blocklist}"