icePigeon/linux-kernel-bbrv3
Archived
Public Access
1
0
Fork 0
Code Actions Packages Releases Activity

Require official Ookla speedtest binary

Browse Source
This commit is contained in:
byjoey
2026-06-13 18:39:31 +08:00
parent a2d07c1a60
commit 4cabf49af5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+10 -5
View File
@@ -44,6 +44,7 @@ MODULES_CONF="/etc/modules-load.d/joeyblog-qdisc.conf"
SECURITY_MODPROBE_CONF="/etc/modprobe.d/99-joeyblog-security.conf" SECURITY_MODPROBE_CONF="/etc/modprobe.d/99-joeyblog-security.conf"
# 可选：提升 GitHub API 限额（支持 GITHUB_TOKEN / GH_TOKEN） # 可选：提升 GitHub API 限额（支持 GITHUB_TOKEN / GH_TOKEN）
GITHUB_API_TOKEN="${GITHUB_TOKEN:-${GH_TOKEN:-}}" GITHUB_API_TOKEN="${GITHUB_TOKEN:-${GH_TOKEN:-}}"
SPEEDTEST_BIN="speedtest"
gh_api_get() { gh_api_get() {
local url="$1" local url="$1"
@@ -193,7 +194,9 @@ calculate_smart_buffer_mb() {
# 函数：确保 Ookla 官方 speedtest 可用 # 函数：确保 Ookla 官方 speedtest 可用
ensure_ookla_speedtest() { ensure_ookla_speedtest() {
if command -v speedtest > /dev/null 2>&1; then if command -v speedtest > /dev/null 2>&1 \
&& speedtest --version 2>&1 | grep -q "Speedtest by Ookla"; then
SPEEDTEST_BIN=$(command -v speedtest)
return 0 return 0
fi fi
@@ -222,7 +225,9 @@ ensure_ookla_speedtest() {
sudo mv speedtest /usr/local/bin/speedtest sudo mv speedtest /usr/local/bin/speedtest
sudo chmod +x /usr/local/bin/speedtest sudo chmod +x /usr/local/bin/speedtest
rm -f speedtest.tgz speedtest.5 speedtest.md rm -f speedtest.tgz speedtest.5 speedtest.md
) ) || return 1
SPEEDTEST_BIN="/usr/local/bin/speedtest"
} }
# 函数：运行 Ookla Speedtest 并解析 Ping/Download/Upload # 函数：运行 Ookla Speedtest 并解析 Ping/Download/Upload
@@ -237,7 +242,7 @@ run_speedtest_measurement() {
local servers_list local servers_list
local speedtest_output="" local speedtest_output=""
local attempt=0 local attempt=0
servers_list=$(speedtest --accept-license --accept-gdpr --servers 2>/dev/null | sed -nE 's/^[[:space:]]*([0-9]+).*/\1/p' | head -n 10) servers_list=$("$SPEEDTEST_BIN" --accept-license --accept-gdpr --servers 2>/dev/null | sed -nE 's/^[[:space:]]*([0-9]+).*/\1/p' | head -n 10)
if [[ -z "$servers_list" ]]; then if [[ -z "$servers_list" ]]; then
servers_list="auto" servers_list="auto"
fi fi
@@ -249,9 +254,9 @@ run_speedtest_measurement() {
fi fi
if [[ "$server_id" == "auto" ]]; then if [[ "$server_id" == "auto" ]]; then
speedtest_output=$(speedtest --accept-license --accept-gdpr 2>&1) speedtest_output=$("$SPEEDTEST_BIN" --accept-license --accept-gdpr 2>&1)
else else
speedtest_output=$(speedtest --accept-license --accept-gdpr --server-id="$server_id" 2>&1) speedtest_output=$("$SPEEDTEST_BIN" --accept-license --accept-gdpr --server-id="$server_id" 2>&1)
fi fi
SPEEDTEST_PING=$(echo "$speedtest_output" | sed -nE 's/.*(Idle Latency|Latency|Ping):[[:space:]]*([0-9]+(\.[0-9]+)?).*/\2/p' | head -n1) SPEEDTEST_PING=$(echo "$speedtest_output" | sed -nE 's/.*(Idle Latency|Latency|Ping):[[:space:]]*([0-9]+(\.[0-9]+)?).*/\2/p' | head -n1)