diff --git a/ipset/def.sh b/ipset/def.sh index 4d8b7c17..9c9667f4 100644 --- a/ipset/def.sh +++ b/ipset/def.sh @@ -141,6 +141,18 @@ zzsize() printf 0 fi } +zzcopy() +{ + local is_gz=0 + zztest "$1" && is_gz=1 + if [ "$GZIP_LISTS" = 1 -a $is_gz = 1 ]; then + cp "$1" "${2}.gz" + elif [ "$GZIP_LISTS" != 1 -a $is_gz != 1 ]; then + cp "$1" "$2" + else + zzcat "$1" | zz "$2" + fi +} digger() { diff --git a/ipset/get_reestr_preresolved.sh b/ipset/get_reestr_preresolved.sh index 6e530e71..4bdee954 100755 --- a/ipset/get_reestr_preresolved.sh +++ b/ipset/get_reestr_preresolved.sh @@ -29,7 +29,7 @@ dl() echo list is too small : $dlsize bytes. can be bad. exit 2 fi - zzcat "$TMPLIST" | zz "$2" + zzcopy "$TMPLIST" "$2" rm -f "$TMPLIST" } diff --git a/ipset/get_reestr_preresolved_smart.sh b/ipset/get_reestr_preresolved_smart.sh index d31c0b3d..3507bb9f 100755 --- a/ipset/get_reestr_preresolved_smart.sh +++ b/ipset/get_reestr_preresolved_smart.sh @@ -29,7 +29,7 @@ dl() echo list is too small : $dlsize bytes. can be bad. exit 2 fi - zzcat "$TMPLIST" | zz "$2" + zzcopy "$TMPLIST" "$2" rm -f "$TMPLIST" } diff --git a/ipset/get_reestr_resolvable_domains.sh b/ipset/get_reestr_resolvable_domains.sh index 3a213ff3..2821446f 100755 --- a/ipset/get_reestr_resolvable_domains.sh +++ b/ipset/get_reestr_resolvable_domains.sh @@ -28,7 +28,7 @@ dl() echo list is too small : $dlsize bytes. can be bad. exit 2 fi - zzcat "$TMPLIST" | zz "$2" + zzcopy "$TMPLIST" "$2" rm -f "$TMPLIST" } diff --git a/ipset/get_refilter_domains.sh b/ipset/get_refilter_domains.sh index 807c0252..c61c867e 100755 --- a/ipset/get_refilter_domains.sh +++ b/ipset/get_refilter_domains.sh @@ -25,7 +25,7 @@ dl() echo list is too small : $dlsize bytes. can be bad. exit 2 fi - zzcat "$TMPLIST" | zz "$2" + zzcopy "$TMPLIST" "$2" rm -f "$TMPLIST" } diff --git a/ipset/get_refilter_ipsum.sh b/ipset/get_refilter_ipsum.sh index f5dd192e..5f15ed0e 100755 --- a/ipset/get_refilter_ipsum.sh +++ b/ipset/get_refilter_ipsum.sh @@ -25,8 +25,7 @@ dl() echo list is too small : $dlsize bytes. can be bad. exit 2 fi - # remove DOS EOL \r - zzcat "$TMPLIST" | zz "$2" + zzcopy "$TMPLIST" "$2" rm -f "$TMPLIST" }