fix: 修复部分失效的流媒体检测，基础信息检测适配MACOS系统

fix: 添加sysbench的天梯图: https://sysbench.spiritlhl.net/
fix: 修复自动更新安装版本中的版本提取代码
2025-09-27 19:52:08 +08:00 · 2025-06-28 13:50:54 +00:00 · 2025-06-15 12:44:45 +00:00 · 2025-06-05 20:45:51 +08:00 · 2025-06-05 20:39:52 +08:00 · 2025-06-05 20:38:56 +08:00
8 changed files with 90 additions and 60 deletions
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -40,3 +40,34 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GHT }}
          GOPRIVATE: github.com/oneclickvirt/security
+
+      - name: Update goecs.sh with new version
+        run: |
+          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            VERSION="${GITHUB_REF#refs/tags/v}"
+          else
+            VERSION=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//' || echo "0.1.37")
+          fi
+          echo "Using version: $VERSION"
+          FILE="goecs.sh"
+          BRANCH="master"
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global --unset url."git@github.com:".insteadOf || true
+          git fetch origin $BRANCH
+          git checkout $BRANCH
+          if [ ! -f "$FILE" ]; then
+            echo "Error: $FILE not found"
+            exit 1
+          fi
+          sed -i "s/\(_yellow \"Unable to get version info, using default version \).*\(\".*\)/\1$VERSION\2/" "$FILE"
+          sed -i "s/\(ECS_VERSION=\"\).*\(\"\)/\1$VERSION\2/" "$FILE"
+          if git diff --quiet "$FILE"; then
+            echo "No changes detected in $FILE"
+            exit 0
+          fi
+          git add "$FILE"
+          git commit -m "chore: update ECS_VERSION to $VERSION in goecs.sh"
+          git push origin $BRANCH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GHT }}
--- a/README.md
+++ b/README.md
@@ -40,9 +40,10 @@ Shell 版本：[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS
 > 更多架构与系统请自行测试，如有问题请开 issues。

 ### **待支持的系统**
-| 系统 | 说明                       |
-|-----|--------------------------|
-| MacOS | 存在硬件测试 BUG 未修复，存在环境依赖未修复 |
+| 系统 | 说明                        |
+|-----|---------------------------|
+| MacOS | 存在硬件测试 BUG 未修复，存在环境依赖未修复  |
+| Android(arm64) | 存在权限问题未修复，非安卓系统的ARM架构无问题  |

 ---

@@ -387,4 +388,4 @@ GOOS=darwin GOARCH=amd64 go build -o goecs_darwin

 ## Stargazers over time

-[![Stargazers over time](https://starchart.cc/oneclickvirt/ecs.svg?variant=adaptive)](https://starchart.cc/oneclickvirt/ecs)
+[![Stargazers over time](https://starchart.cc/oneclickvirt/ecs.svg?variant=adaptive)](https://www.spiritlhl.net)
--- a/README_EN.md
+++ b/README_EN.md
@@ -39,10 +39,10 @@ Shell version: [https://github.com/spiritLHLS/ecs/blob/main/README_EN.md](https:
 > Please test additional architectures and systems yourself. If you encounter any issues, please open an issue.

 ### **Systems Pending Support**
-| OS     | Notes                                                  |
-|--------|--------------------------------------------------------|
-| MacOS  | Hardware testing bugs and environment dependencies unresolved |
-
+| OS     | Notes                                                                                           |
+|--------|-------------------------------------------------------------------------------------------------|
+| MacOS  | Hardware testing bugs and environment dependencies unresolved                                   |
+| Android(arm64) | Permission issues that are not fixed, no problems with ARM architecture for non-Android systems |
 ---

 ## **Features**
@@ -90,6 +90,12 @@ Shell version: [https://github.com/spiritLHLS/ecs/blob/main/README_EN.md](https:
  export noninteractive=true && curl -L https://cnb.cool/oneclickvirt/ecs/-/git/raw/main/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs -l en
  ```

+- **Short Link:**
+
+  ```bash
+  export noninteractive=true && curl -L https://bash.spiritlhl.net/goecs -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+  ``
+
 #### **Detailed instructions**

 **Detailed description** of the commands in **Command **Controls whether to install dependencies**, **Whether to update the package manager**, **Default interaction mode can be selected***
@@ -379,4 +385,4 @@ Thanks also to the following platforms for editorial and testing support

 ## Stargazers over time

-[![Stargazers over time](https://starchart.cc/oneclickvirt/ecs.svg?variant=adaptive)](https://starchart.cc/oneclickvirt/ecs)
+[![Stargazers over time](https://starchart.cc/oneclickvirt/ecs.svg?variant=adaptive)](https://www.spiritlhl.net)
--- a/README_NEW_USER.md
+++ b/README_NEW_USER.md
@@ -110,6 +110,8 @@ AMD的7950x单核满血性能得分在6500左右，AMD的5950x单核满血性能

 有时候多核得分和单核得分一样，证明商家在限制程序并发使用CPU，典型例子腾讯云。

+```Sysbench```的基准可见 [CPU Performance Ladder For Sysbench](https://sysbench.spiritlhl.net/) 天梯图，具体得分不分测试的sysbench的版本。
+
 ```GeekBench```的基准可见 [官方网站](https://browser.geekbench.com/processor-benchmarks/) 天梯图，具体得分每个```GeekBench```版本都不一样，注意使用时测试的```GeekBench```版本是什么。

 多说一句，```GeekBench```测的很多内容，实际在服务器使用过程中根本用不到，测试仅供参考。当然```Sysbench```非常不全面，但它基于最基础的计算性能可以大致比较CPU的性能。
@@ -279,6 +281,8 @@ AMD's 7950x single-core full performance score is around 6500, AMD's 5950x singl

 Sometimes multi-core scores are the same as single-core scores, proving that the vendor is limiting program concurrent use of CPU, a typical example being Tencent Cloud.

+Benchmarks for ```Sysbench`` can be found in the [CPU Performance Ladder For Sysbench](https://sysbench.spiritlhl.net/) ladder chart, with specific scores regardless of the version of sysbench tested.
+
 For `GeekBench` baselines, see the [official website](https://browser.geekbench.com/processor-benchmarks/) ladder chart. Specific scores differ for each `GeekBench` version, so note which `GeekBench` version is being used when testing.

 As an additional note, many things tested by `GeekBench` are not actually used in server usage processes, so the test is for reference only. Of course, `Sysbench` is very incomplete, but it can roughly compare CPU performance based on the most basic computational performance.
@@ -424,6 +428,8 @@ AMDの7950xシングルコアのフルパフォーマンススコアは約6500

 時々、マルチコアスコアとシングルコアスコアが同じ場合があります。これは販売者がプログラムの並列CPU使用を制限していることを示しています。典型的な例はTencent Cloudです。

+Sysbenchのベンチマークは[CPU Performance Ladder For Sysbench](https://sysbench.spiritlhl.net/)のラダーチャートで見ることができる。
+
 ```GeekBench```の基準は[公式ウェブサイト](https://browser.geekbench.com/processor-benchmarks/)の階層チャートを参照してください。具体的なスコアは各```GeekBench```バージョンで異なるため、テスト時の```GeekBench```バージョンに注意してください。

 補足ですが、```GeekBench```がテストする多くの内容は、サーバー使用過程で実際には必要ないことが多いです。テストは参考程度にしてください。もちろん```Sysbench```は非常に包括的ではありませんが、基本的な計算性能に基づいてCPUのパフォーマンスを大まかに比較できます。
--- a/go.mod
+++ b/go.mod
@@ -7,9 +7,9 @@ toolchain go1.24.2
 require (
 	github.com/imroc/req/v3 v3.50.0
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841
-	github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926
+	github.com/oneclickvirt/UnlockTests v0.0.27-20250628125053
 	github.com/oneclickvirt/backtrace v0.0.5-20250517095024
-	github.com/oneclickvirt/basics v0.0.12-20250521031609
+	github.com/oneclickvirt/basics v0.0.13-20250628134234
 	github.com/oneclickvirt/cputest v0.0.10-20250404151448
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
 	github.com/oneclickvirt/disktest v0.0.8-20250425015826
--- a/go.sum
+++ b/go.sum
@@ -99,12 +99,12 @@ github.com/nxtrace/NTrace-core v1.4.0 h1:pDN2BqxIYjedDKCDDOFBcDNOBnavGcx+4wbiG65
 github.com/nxtrace/NTrace-core v1.4.0/go.mod h1:0AWqbqiIJbpbFG6W48vtJ6pWM8PPF+lQ1fi2371y+zA=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841 h1:Zef93z9UiZQwRAKnnZYALmpBKvvuVaq34MEsuWwk6nc=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
-github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926 h1:H5//xwVjDR02bQ1hLa3G7LnwccsudPMjBVt7WCx2y/U=
-github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926/go.mod h1:yXWIZB6iLS88pEd9m4QJi1GENn+7I91zA72y5ONz2Oc=
+github.com/oneclickvirt/UnlockTests v0.0.27-20250628125053 h1:Ug8kySZR1weRUcsnGOv+f3HAl791AfkA7EWV3JmiMQA=
+github.com/oneclickvirt/UnlockTests v0.0.27-20250628125053/go.mod h1:yXWIZB6iLS88pEd9m4QJi1GENn+7I91zA72y5ONz2Oc=
 github.com/oneclickvirt/backtrace v0.0.5-20250517095024 h1:j912aga/17znOqMB2VAxWOQYa4GL6YMFBhv+6c7jkvA=
 github.com/oneclickvirt/backtrace v0.0.5-20250517095024/go.mod h1:5AH00bo41hH3d2/JVuCTlBkZUs3AXX4nlKVXb6piZcI=
-github.com/oneclickvirt/basics v0.0.12-20250521031609 h1:3WxHe+jKrZHF81oa8Xk3IgHCRqTC5GDjv8alR0geamU=
-github.com/oneclickvirt/basics v0.0.12-20250521031609/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
+github.com/oneclickvirt/basics v0.0.13-20250628134234 h1:ykbtiheQsN/lPc6z4X6oMYco4ZpDwQZ7z98jWnKi8oU=
+github.com/oneclickvirt/basics v0.0.13-20250628134234/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
 github.com/oneclickvirt/cputest v0.0.10-20250404151448 h1:ovGtCwFXG0qmpyNDRqcNDIiAmhrtemCjIUXTJ1fPH0o=
 github.com/oneclickvirt/cputest v0.0.10-20250404151448/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
 github.com/oneclickvirt/dd v0.0.1-20250406062523 h1:jegTww4fuoFEqwFozvGJEqUNI/5ew3QJ0XcKZZ/zuTs=
--- a/goecs.go
+++ b/goecs.go
@@ -38,7 +38,7 @@ import (
 )

 var (
-	ecsVersion                                                        = "v0.1.33"
+	ecsVersion                                                        = "v0.1.37"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
--- a/goecs.sh
+++ b/goecs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # From https://github.com/oneclickvirt/ecs
-# 2025.04.07
+# 2025.06.05

 # curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 # 或
@@ -119,12 +119,30 @@ cleanup_epel() {
 }

 goecs_check() {
-    # Get system and architecture info with error handling
+    if command -v apt-get >/dev/null 2>&1; then
+        INSTALL_CMD="apt-get -y install"
+    elif command -v yum >/dev/null 2>&1; then
+        INSTALL_CMD="yum -y install"
+    elif command -v dnf >/dev/null 2>&1; then
+        INSTALL_CMD="dnf -y install"
+    elif command -v pacman >/dev/null 2>&1; then
+        INSTALL_CMD="pacman -S --noconfirm"
+    elif command -v apk >/dev/null 2>&1; then
+        INSTALL_CMD="apk add"
+    elif command -v zypper >/dev/null 2>&1; then
+        INSTALL_CMD="zypper install -y"
+    fi
+    if ! command -v unzip >/dev/null 2>&1; then
+        _green "Installing unzip"
+        ${INSTALL_CMD} unzip
+    fi
+    if ! command -v curl >/dev/null 2>&1; then
+        _green "Installing curl"
+        ${INSTALL_CMD} curl
+    fi
    os=$(uname -s 2>/dev/null || echo "Unknown")
    arch=$(uname -m 2>/dev/null || echo "Unknown")
-    # First check for China IP
    check_china
-    # Get latest version number with multiple backup sources
    ECS_VERSION=""
    for api in \
        "https://api.github.com/repos/oneclickvirt/ecs/releases/latest" \
@@ -140,7 +158,6 @@ goecs_check() {
        _yellow "Unable to get version info, using default version 0.1.33"
        ECS_VERSION="0.1.33"
    fi
-    # Check if original goecs command exists
    version_output=""
    for cmd_path in "goecs" "./goecs" "/usr/bin/goecs" "/usr/local/bin/goecs"; do
        if [ -x "$(command -v $cmd_path 2>/dev/null)" ]; then
@@ -164,7 +181,6 @@ goecs_check() {
        _green "goecs not found, installation needed, starting in 5 seconds"
    fi
    sleep 5
-    # Download corresponding version with error handling
    if [[ "$CN" == true ]]; then
        _yellow "Using China mirror for download..."
        base_url="https://cnb.cool/oneclickvirt/ecs/-/git/raw/main"
@@ -177,7 +193,6 @@ goecs_check() {
            base_url="https://github.com/oneclickvirt/ecs/releases/download/v${ECS_VERSION}"
        fi
    fi
-    # Build download URL with architecture support
    local zip_file=""
    case $os in
        Linux|linux|LINUX)
@@ -215,7 +230,6 @@ goecs_check() {
    esac
    download_url="${base_url}/${zip_file}"
    _green "Downloading $download_url"
-    # Download file with retry mechanism
    local max_retries=3
    local retry_count=0
    while [ $retry_count -lt $max_retries ]; do
@@ -230,29 +244,11 @@ goecs_check() {
        _red "Download failed, please check your network connection or download manually"
        return 1
    fi
-    if ! command -v unzip >/dev/null 2>&1; then
-        _green "Installing $cmd"
-        if command -v apt-get >/dev/null 2>&1; then
-            INSTALL_CMD="apt-get -y install"
-        elif command -v yum >/dev/null 2>&1; then
-            INSTALL_CMD="yum -y install"
-        elif command -v dnf >/dev/null 2>&1; then
-            INSTALL_CMD="dnf -y install"
-        elif command -v pacman >/dev/null 2>&1; then
-            INSTALL_CMD="pacman -S --noconfirm"
-        elif command -v apk >/dev/null 2>&1; then
-            INSTALL_CMD="apk add"
-        elif command -v zypper >/dev/null 2>&1; then
-            INSTALL_CMD="zypper install -y"
-        fi
-        ${INSTALL_CMD} "$cmd"
-    fi
    if ! unzip -o goecs.zip >/dev/null 2>&1; then
        _red "Extraction failed"
        return 1
    fi
    rm -f goecs.zip README.md LICENSE README_EN.md
-    # Set execution permissions and install
    chmod 777 goecs
    for install_path in "/usr/bin" "/usr/local/bin"; do
        if [ -d "$install_path" ]; then
@@ -260,7 +256,6 @@ goecs_check() {
            break
        fi
    done
-    # Set system parameters
    if [ "$os" != "Darwin" ]; then
        PARAM="net.ipv4.ping_group_range"
        NEW_VALUE="0 2147483647"
@@ -273,7 +268,6 @@ goecs_check() {
            sysctl -p >/dev/null 2>&1
        fi
    fi
-    # Set special permissions
    setcap cap_net_raw=+ep goecs 2>/dev/null
    setcap cap_net_raw=+ep /usr/bin/goecs 2>/dev/null
    setcap cap_net_raw=+ep /usr/local/bin/goecs 2>/dev/null
@@ -320,15 +314,15 @@ InstallSysbench() {
            fi
        fi
        case "$Var_OSRelease" in
-        ubuntu | debian | astra) 
+        ubuntu | debian | astra)
            ! apt-get install -y sysbench && apt-get --fix-broken install -y && apt-get install --no-install-recommends -y sysbench ;;
-        centos | rhel | almalinux | redhat | opencloudos) 
+        centos | rhel | almalinux | redhat | opencloudos)
            (yum -y install epel-release && yum -y install sysbench) || (dnf install epel-release -y && dnf install sysbench -y) ;;
-        fedora) 
+        fedora)
            dnf -y install sysbench ;;
-        arch) 
+        arch)
            pacman -S --needed --noconfirm sysbench && pacman -S --needed --noconfirm libaio && ldconfig ;;
-        freebsd) 
+        freebsd)
            pkg install -y sysbench ;;
        alpinelinux)
            if [ "$noninteractive" != "true" ]; then
@@ -359,7 +353,7 @@ InstallSysbench() {
                    echo -e "${Msg_Success}Sysbench installed successfully."
                fi
            fi ;;
-        *) 
+        *)
            _red "Sysbench Install Error: Unknown OS release: $Var_OSRelease" ;;
        esac
        if [[ $SYSTEM =~ ^(CentOS|RHEL|AlmaLinux)$ ]]; then
@@ -442,7 +436,6 @@ env_check() {
    PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed" "pkg install -y" "apk add --no-cache" "pkg_add -I" "yum -y install")
    PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm" "pkg delete" "apk del" "pkg_delete -I" "yum -y remove")
    PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "pacman -Rns --noconfirm" "pkg autoremove" "apk autoremove" "pkg_delete -a" "yum -y autoremove")
-    # Check system information
    if [ -f /etc/opencloudos-release ]; then
        SYS="opencloudos"
    elif [ -s /etc/os-release ]; then
@@ -460,7 +453,6 @@ env_check() {
    else
        SYS="$(uname -s)"
    fi
-    # Match operating system
    SYSTEM=""
    for ((int = 0; int < ${#REGEX[@]}; int++)); do
        if [[ $(echo "$SYS" | tr '[:upper:]' '[:lower:]') =~ ${REGEX[int]} ]]; then
@@ -472,7 +464,6 @@ env_check() {
            break
        fi
    done
-    # If system is unrecognized, try common package managers
    if [ -z "$SYSTEM" ]; then
        _yellow "Unable to recognize system, trying common package managers..."
        if command -v apt-get >/dev/null 2>&1; then
@@ -539,14 +530,12 @@ env_check() {
            fi
        fi
    fi
-    # Install necessary commands
    for cmd in sudo wget tar unzip iproute2 systemd-detect-virt dd fio; do
        if ! command -v "$cmd" >/dev/null 2>&1; then
            _green "Installing $cmd"
            ${INSTALL_CMD} "$cmd"
        fi
    done
-    # sysbench installation
    if ! command -v sysbench >/dev/null 2>&1; then
        _green "Installing sysbench"
        ${INSTALL_CMD} sysbench
@@ -561,7 +550,6 @@ env_check() {
            Check_SysBench
        fi
    fi
-    # geekbench and speedtest installation
    if ! command -v geekbench >/dev/null 2>&1; then
        _green "Installing geekbench"
        curl -L "${cdn_success_url}https://raw.githubusercontent.com/oneclickvirt/cputest/main/dgb.sh" -o dgb.sh && chmod +x dgb.sh
@@ -580,7 +568,6 @@ env_check() {
        ${INSTALL_CMD} iputils-ping >/dev/null 2>&1
        ${INSTALL_CMD} ping >/dev/null 2>&1
    fi
-    # MacOS support
    if [ "$(uname -s)" = "Darwin" ]; then
        echo "Detected MacOS, installing sysbench iproute2mac..."
        brew install --force sysbench iproute2mac
@@ -616,7 +603,7 @@ show_help() {
                          3. 关键服务失败
                          推荐：
                          环境依赖安装过程中挂起执行
-                          
+
                          可选组件:
                          sysbench/geekbench (CPU性能测试)
                          sudo, tar, unzip, dd, fio
@@ -643,7 +630,7 @@ Available commands:
                           3. Critical service failures
                           Recommended:
                           Hanging execution during environment dependency installation
-                           
+
                           Optional components:
                           sysbench/geekbench (CPU testing)
                           sudo, tar, unzip, dd, fio
@@ -677,4 +664,3 @@ case "$1" in
    show_help
    ;;
 esac
-
Author	SHA1	Message	Date
spiritlhl	ea8e5efbd3	fix: 修复部分失效的流媒体检测，基础信息检测适配MACOS系统	2025-06-28 13:50:54 +00:00
spiritlhl	db88ee8479	fix: 添加sysbench的天梯图: https://sysbench.spiritlhl.net/	2025-06-15 12:44:45 +00:00
spiritlhl	67a3bfdaad	fix: 修复自动更新安装版本中的版本提取代码	2025-06-05 20:45:51 +08:00
spiritlhl	e57ce05c0c	fix: 回退修改	2025-06-05 20:39:52 +08:00
spiritlhl	62137f0bb1	fix: 修复仅安装本体时，可能宿主机连curl/unzip都没有的问他	2025-06-05 20:38:56 +08:00
spiritlhl	f9d8c9ee4c	fix: 修复step匹配规则	2025-06-03 23:19:46 +08:00
spiritlhl	913a1725c1	fix: 修复版本号问题	2025-06-03 22:17:12 +08:00
spiritlhl	f1acbd361b	fix: 自动替换和更新goecs.sh脚本中的最新tag	2025-06-03 22:13:41 +08:00
spiritlhl	d6f62f8624	fix: 添加部分说明	2025-05-23 15:41:48 +08:00