drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-30 05:50:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

ipset: github disabled gzip support

Browse Source
This commit is contained in:
bol-van 2024-06-19 09:03:15 +03:00
parent dcae31fae8
commit eebe68ca65
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipset/def.sh
View File

@ -103,13 +103,21 @@ zzexist()
{ {
[ -f "$1.gz" ] || [ -f "$1" ] [ -f "$1.gz" ] || [ -f "$1" ]
} }
zztest()
{
gzip -t "$1" 2>/dev/null
}
zzcat() zzcat()
{ {
if [ -f "$1.gz" ]; then if [ -f "$1.gz" ]; then
gunzip -c "$1.gz" gunzip -c "$1.gz"
elif [ -f "$1" ]; then elif [ -f "$1" ]; then
if zztest "$1"; then
gunzip -c "$1"
else
cat "$1" cat "$1"
fi fi
fi
} }
zz() zz()
{ {

2
ipset/get_reestr_hostlist.sh
View File

@ -16,7 +16,7 @@ dl_checked()
# $3 - minsize # $3 - minsize
# $4 - maxsize # $4 - maxsize
# $5 - maxtime # $5 - maxtime
curl -H "Accept-Encoding: gzip" -k --fail --max-time $5 --connect-timeout 10 --retry 4 --max-filesize $4 "$1" | gunzip - >"$2" || curl -k --fail --max-time $5 --connect-timeout 10 --retry 4 --max-filesize $4 -o "$2" "$1" ||
{ {
echo list download failed : $1 echo list download failed : $1
return 2 return 2

4
ipset/get_reestr_preresolved.sh
View File

@ -19,7 +19,7 @@ dl()
# $2 - file # $2 - file
# $3 - minsize # $3 - minsize
# $4 - maxsize # $4 - maxsize
curl -H "Accept-Encoding: gzip" -k --fail --max-time 120 --connect-timeout 10 --retry 4 --max-filesize $4 "$1" | gunzip - >"$TMPLIST" || curl -H "Accept-Encoding: gzip" -k --fail --max-time 120 --connect-timeout 10 --retry 4 --max-filesize $4 -o "$TMPLIST" "$1" ||
{ {
echo list download failed : $1 echo list download failed : $1
exit 2 exit 2
@ -29,7 +29,7 @@ dl()
echo list is too small : $dlsize bytes. can be bad. echo list is too small : $dlsize bytes. can be bad.
exit 2 exit 2
fi fi
zz "$2" <"$TMPLIST" zzcat "$TMPLIST" | zz "$2"
rm -f "$TMPLIST" rm -f "$TMPLIST"
} }

4
ipset/get_reestr_preresolved_smart.sh
View File

@ -19,7 +19,7 @@ dl()
# $2 - file # $2 - file
# $3 - minsize # $3 - minsize
# $4 - maxsize # $4 - maxsize
curl -H "Accept-Encoding: gzip" -k --fail --max-time 120 --connect-timeout 10 --retry 4 --max-filesize $4 "$1" | gunzip - >"$TMPLIST" || curl -H "Accept-Encoding: gzip" -k --fail --max-time 120 --connect-timeout 10 --retry 4 --max-filesize $4 -o "$TMPLIST" "$1" ||
{ {
echo list download failed : $1 echo list download failed : $1
exit 2 exit 2
@ -29,7 +29,7 @@ dl()
echo list is too small : $dlsize bytes. can be bad. echo list is too small : $dlsize bytes. can be bad.
exit 2 exit 2
fi fi
zz "$2" <"$TMPLIST" zzcat "$TMPLIST" | zz "$2"
rm -f "$TMPLIST" rm -f "$TMPLIST"
} }

4
ipset/get_reestr_resolvable_domains.sh
View File

@ -18,7 +18,7 @@ dl()
# $2 - file # $2 - file
# $3 - minsize # $3 - minsize
# $4 - maxsize # $4 - maxsize
curl -H "Accept-Encoding: gzip" -k --fail --max-time 120 --connect-timeout 10 --retry 4 --max-filesize $4 "$1" | gunzip - >"$TMPLIST" || curl -H "Accept-Encoding: gzip" -k --fail --max-time 120 --connect-timeout 10 --retry 4 --max-filesize $4 -o "$TMPLIST" "$1" ||
{ {
echo list download failed : $1 echo list download failed : $1
exit 2 exit 2
@ -28,7 +28,7 @@ dl()
echo list is too small : $dlsize bytes. can be bad. echo list is too small : $dlsize bytes. can be bad.
exit 2 exit 2
fi fi
zz "$2" <"$TMPLIST" zzcat "$TMPLIST" | zz "$2"
rm -f "$TMPLIST" rm -f "$TMPLIST"
} }

2
ipset/get_reestr_resolve.sh
View File

@ -19,7 +19,7 @@ dl_checked()
# $3 - minsize # $3 - minsize
# $4 - maxsize # $4 - maxsize
# $5 - maxtime # $5 - maxtime
curl -H "Accept-Encoding: gzip" -k --fail --max-time $5 --connect-timeout 10 --retry 4 --max-filesize $4 "$1" | gunzip - >"$2" || curl -k --fail --max-time $5 --connect-timeout 10 --retry 4 --max-filesize $4 -o "$2" "$1" ||
{ {
echo list download failed : $1 echo list download failed : $1
return 2 return 2