sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

termux-tools: use 5 seconds connection timeout when testing mirror availability

Browse Source
This commit is contained in:
Leonid Pliushch 2020-08-02 01:50:34 +03:00
parent 86816e7bf0
commit 578f66a5e3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/termux-tools/build.sh
View File

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://termux.com/ TERMUX_PKG_HOMEPAGE=https://termux.com/
TERMUX_PKG_DESCRIPTION="Basic system tools for Termux" TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=0.91 TERMUX_PKG_VERSION=0.92
TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_SKIP_SRC_EXTRACT=true
TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_ESSENTIAL=true

13
packages/termux-tools/pkg
View File

@ -61,9 +61,14 @@ select_mirror() {
# Mirrors are rotated if 6 hours timeout has been passed or mirror is no longer accessible. # Mirrors are rotated if 6 hours timeout has been passed or mirror is no longer accessible.
if [ -n "$(find /data/data/com.termux/cache/apt/pkgcache.bin -mmin -360 2>/dev/null)" ]; then if [ -n "$(find /data/data/com.termux/cache/apt/pkgcache.bin -mmin -360 2>/dev/null)" ]; then
if [ -n "${current_mirror}" ] && curl --user-agent 'Termux-PKG/1.0 mirror-checker' --head --fail --location "${current_mirror}/dists/stable/Release" >/dev/null 2>&1; then if [ -n "${current_mirror}" ]; then
echo "Reusing mirror: ${current_mirror}" echo -n "Checking availability of current mirror: "
return if curl --connect-timeout 5 --user-agent 'Termux-PKG/1.0 mirror-checker' --head --fail --location "${current_mirror}/dists/stable/Release" >/dev/null 2>&1; then
echo "ok"
return
else
echo "bad"
fi
fi fi
fi fi
@ -72,7 +77,7 @@ select_mirror() {
local w total_mirror_weight=0 local w total_mirror_weight=0
for w in "${!mirrors[@]}"; do for w in "${!mirrors[@]}"; do
echo -n "[*] ${mirrors[$w]}: " echo -n "[*] ${mirrors[$w]}: "
if curl --user-agent 'Termux-PKG/1.0 mirror-checker' --head --fail --location "${mirrors[$w]}/dists/stable/Release" >/dev/null 2>&1; then if curl --connect-timeout 5 --user-agent 'Termux-PKG/1.0 mirror-checker' --head --fail --location "${mirrors[$w]}/dists/stable/Release" >/dev/null 2>&1; then
echo "ok" echo "ok"
total_mirror_weight=$((total_mirror_weight + w)) total_mirror_weight=$((total_mirror_weight + w))
else else