update

README_EN.md

@@ -1,4 +1,4 @@
-# ECS
+# ecs
 
 [![release](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml/badge.svg)](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml) [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Foneclickvirt%2Fecs&count_bg=%2357DEFF&title_bg=%23000000&icon=cliqz.svg&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://www.spiritlhl.net/)
 

go.mod

@@ -5,12 +5,12 @@ go 1.22.4
 require (
 	github.com/imroc/req/v3 v3.43.7
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502
-	github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930
+	github.com/oneclickvirt/UnlockTests v0.0.11-20240704100256
 	github.com/oneclickvirt/backtrace v0.0.4-20240702140722
 	github.com/oneclickvirt/basics v0.0.5-20240702055351
 	github.com/oneclickvirt/cputest v0.0.8-20240702070215
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
-	github.com/oneclickvirt/disktest v0.0.4-20240702071738
+	github.com/oneclickvirt/disktest v0.0.4-20240704095213
 	github.com/oneclickvirt/gostun v0.0.3-20240702054621
 	github.com/oneclickvirt/memorytest v0.0.2-20240702031042
 	github.com/oneclickvirt/nt3 v0.0.3-20240702132013

go.sum

@@ -77,8 +77,8 @@ github.com/nxtrace/NTrace-core v1.3.1 h1:f4z5UaZEuhUP/g6xElpZ2bo+guWITJVrMKrJTqd
 github.com/nxtrace/NTrace-core v1.3.1/go.mod h1:0Px/Zc60qk6cssmP+yv4kstFxvX9sXqDduoVqBO+qf8=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502 h1:hRIYJ2uEp2N3AH5bP5X6bwfdwWfZQO/2WoqpUJ8+WsY=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
-github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930 h1:/Sc4Eas1Pso18ak93wlazkuMKRRElCntITja/0opOpM=
-github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
+github.com/oneclickvirt/UnlockTests v0.0.11-20240704100256 h1:d1RFJKKVtyQoDypLxZlZcVL7Q2O2c7f+DjMje2yRO0E=
+github.com/oneclickvirt/UnlockTests v0.0.11-20240704100256/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722 h1:UJ/VWf+ZbhGarc9HcHMIyenpmX+b2LxkXu0hlLk3Gxs=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
 github.com/oneclickvirt/basics v0.0.5-20240702055351 h1:Ez9iLNAr+A8AA3EdcDh1aB/XVSWjwSKjhgMUySkcSSY=
@@ -87,8 +87,8 @@ github.com/oneclickvirt/cputest v0.0.8-20240702070215 h1:CcFpyVPlQkJ6vjFP17BRuJh
 github.com/oneclickvirt/cputest v0.0.8-20240702070215/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
 github.com/oneclickvirt/defaultset v0.0.2-20240624082446 h1:5Pg3mK/u/vQvSz7anu0nxzrNdELi/AcDAU1mMsmPzyc=
 github.com/oneclickvirt/defaultset v0.0.2-20240624082446/go.mod h1:e9Jt4tf2sbemCtc84/XgKcHy9EZ2jkc5x2sW1NiJS+E=
-github.com/oneclickvirt/disktest v0.0.4-20240702071738 h1:3rErTS9RwU8jAmGc8LqjtFBBd94lIk+wSWpohI55C/w=
-github.com/oneclickvirt/disktest v0.0.4-20240702071738/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
+github.com/oneclickvirt/disktest v0.0.4-20240704095213 h1:ATIc0VeFBnYvfKjJCtDZS6hTxTU9nTFvUmfzGkr6Clw=
+github.com/oneclickvirt/disktest v0.0.4-20240704095213/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
 github.com/oneclickvirt/gostun v0.0.3-20240702054621 h1:IE89eEYV9TJbF94SakQDAxTLIaqX+Tb6ZhJ/CCIP+90=
 github.com/oneclickvirt/gostun v0.0.3-20240702054621/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA=
 github.com/oneclickvirt/memorytest v0.0.2-20240702031042 h1:j+LsjOh5glYiidqtSqjZJRw694LYW1PHLMh6AovluTQ=

goecs.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/oneclickvirt/CommonMediaTests/commediatests"
+	unlocktestmodel "github.com/oneclickvirt/UnlockTests/model"
 	backtraceori "github.com/oneclickvirt/backtrace/bk"
 	basicmodel "github.com/oneclickvirt/basics/model"
 	cputestmodel "github.com/oneclickvirt/cputest/model"
@@ -36,7 +37,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.0.36"
+	ecsVersion                                                        = "v0.0.38"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -85,6 +86,7 @@ func main() {
 	goecsFlag.StringVar(&nt3CheckType, "nt3t", "ipv4", "Set NT3 test type (supported: both, ipv4, ipv6)")
 	goecsFlag.IntVar(&spNum, "spnum", 2, "Set the number of servers per operator for speed test")
 	goecsFlag.BoolVar(&enableLogger, "log", false, "Enable/Disable logging in the current path")
+	goecsFlag.BoolVar(&enabelUpload, "upload", true, "Enable/Disable upload the result")
 	goecsFlag.Parse(os.Args[1:])
 	if help {
 		fmt.Printf("Usage: %s [options]\n", os.Args[0])
@@ -104,6 +106,7 @@ func main() {
 		memorytestmodel.EnableLoger = true
 		disktestmodel.EnableLoger = true
 		commediatests.EnableLoger = true
+		unlocktestmodel.EnableLoger = true
 		ptmodel.EnableLoger = true
 		backtraceori.EnableLoger = true
 		nt3model.EnableLoger = true
@@ -245,6 +248,9 @@ func main() {
 		backtraceStatus = false
 		nt3Status = false
 	}
+	if !enabelUpload {
+		securityTestStatus = false
+	}
 	startTime := time.Now()
 	var (
 		wg1, wg2                                      sync.WaitGroup

goecs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #From https://github.com/oneclickvirt/ecs
-#2024.06.29
+#2024.07.04
 
 # curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 
@@ -233,57 +233,75 @@ 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")
     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")
     PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "" "pkg autoremove" "apk autoremove")
-    if [ -s /etc/os-release ]; then
-      SYS="$(grep -i pretty_name /etc/os-release | cut -d \" -f2)"
+    # 检查系统信息
+    if [ -f /etc/alpine-release ]; then
+        SYS="alpine"
+    elif [ -s /etc/os-release ]; then
+        SYS="$(grep -i pretty_name /etc/os-release | cut -d \" -f2)"
     elif [ -x "$(type -p hostnamectl)" ]; then
-      SYS="$(hostnamectl | grep -i system | cut -d : -f2)"
+        SYS="$(hostnamectl | grep -i system | cut -d : -f2 | xargs)"
     elif [ -x "$(type -p lsb_release)" ]; then
-      SYS="$(lsb_release -sd)"
+        SYS="$(lsb_release -sd)"
     elif [ -s /etc/lsb-release ]; then
-      SYS="$(grep -i description /etc/lsb-release | cut -d \" -f2)"
+        SYS="$(grep -i description /etc/lsb-release | cut -d \" -f2)"
     elif [ -s /etc/redhat-release ]; then
-      SYS="$(grep . /etc/redhat-release)"
+        SYS="$(grep . /etc/redhat-release)"
     elif [ -s /etc/issue ]; then
-      SYS="$(grep . /etc/issue | cut -d '\' -f1 | sed '/^[ ]*$/d')"
-    elif [ -f /etc/alpine-release ]; then
-      SYS="alpine"
+        SYS="$(grep . /etc/issue | cut -d '\' -f1 | sed '/^[ ]*$/d')"
     else
-      SYS="$(uname -s)}"
+        SYS="$(uname -s)"
     fi
     [[ -n $SYS ]] || exit 1
+    # 匹配操作系统
     for ((int = 0; int < ${#REGEX[@]}; int++)); do
         if [[ $(echo "$SYS" | tr '[:upper:]' '[:lower:]') =~ ${REGEX[int]} ]]; then
             SYSTEM="${RELEASE[int]}"
             [[ -n $SYSTEM ]] && break
         fi
     done
+    # 检查是否成功匹配
+    [[ -n $SYSTEM ]] || exit 1
+    # 根据 SYSTEM 设置相应的包管理命令
+    UPDATE_CMD=${PACKAGE_UPDATE[int]}
+    INSTALL_CMD=${PACKAGE_INSTALL[int]}
+    REMOVE_CMD=${PACKAGE_REMOVE[int]}
+    UNINSTALL_CMD=${PACKAGE_UNINSTALL[int]}
+    echo "System: $SYSTEM"
+    echo "Update command: $UPDATE_CMD"
+    echo "Install command: $INSTALL_CMD"
+    echo "Remove command: $REMOVE_CMD"
+    echo "Uninstall command: $UNINSTALL_CMD"
     cdn_urls=("https://cdn0.spiritlhl.top/" "http://cdn3.spiritlhl.net/" "http://cdn1.spiritlhl.net/" "http://cdn2.spiritlhl.net/")
     check_cdn_file
     _green "Update system manager."
-    $PACKAGE_UPDATE command 2>/dev/null
+    ${PACKAGE_UPDATE[int]} command 2>/dev/null
     if ! command -v sudo >/dev/null 2>&1; then
-            _green "Installing sudo"
-            $PACKAGE_INSTALL sudo
-        fi
+        _green "Installing sudo"
+        ${PACKAGE_INSTALL[int]} sudo
+    fi
+    if ! command -v wget >/dev/null 2>&1; then
+        _green "Installing wget"
+        ${PACKAGE_INSTALL[int]} wget
+    fi
     if ! command -v tar >/dev/null 2>&1; then
         _green "Installing tar"
-        $PACKAGE_INSTALL tar
+        ${PACKAGE_INSTALL[int]} tar
     fi
     if ! command -v unzip >/dev/null 2>&1; then
         _green "Installing unzip"
-        $PACKAGE_INSTALL unzip
+        ${PACKAGE_INSTALL[int]} unzip
     fi
     if ! command -v dd >/dev/null 2>&1; then
         _green "Installing dd"
-        $PACKAGE_INSTALL dd
+        ${PACKAGE_INSTALL[int]} dd
     fi
     if ! command -v fio >/dev/null 2>&1; then
         _green "Installing fio"
-        $PACKAGE_INSTALL fio
+        ${PACKAGE_INSTALL[int]} fio
     fi
     if ! command -v sysbench >/dev/null 2>&1; then
         _green "Installing sysbench"
-        $PACKAGE_INSTALL sysbench
+        ${PACKAGE_INSTALL[int]} sysbench
         if [ $? -ne 0 ]; then
             echo "Unable to download sysbench through the system's package manager, speak to try compiling and installing it..."
             if ! wget -O /tmp/sysbench.zip "${cdn_success_url}https://github.com/akopytov/sysbench/archive/1.0.20.zip"; then
@@ -349,12 +367,13 @@ show_help() {
 Available commands:
 
 ./goecs.sh env             Check and Install package:
-                                sudo (Almost all unix-like systems have it.)
-                                tar (Almost all unix-like systems have it.)
+                                sudo  (Almost all unix-like systems have it.)
+                                wget  (Almost all unix-like systems have it.)
+                                tar   (Almost all unix-like systems have it.)
                                 unzip (Almost all unix-like systems have it.)
-                                dd (Almost all unix-like systems have it.)
-                                fio (Almost all unix-like systems can be installed through the system's package manager.)
-                                sysbench (Almost all unix-like systems can be installed through the system's package manager.)
+                                dd    (Almost all unix-like systems have it.)
+                                fio   (Almost all unix-like systems can be installed through the system's package manager.)
+                                sysbench  (Almost all unix-like systems can be installed through the system's package manager.)
                                 geekbench (geekbench5)(Only support IPV4 environment, and memory greater than 1GB network detection, only support amd64 and arm64 architecture.)
                                 speedtest (Use the officially provided binaries for more accurate test results.)
                                 ping (Use the officially provided binaries for more accurate test results.)