v0.0.85 更新分区模块，更新shell相关脚本修复隐藏BUG

README.md

@@ -70,7 +70,7 @@ curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o go
 curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 ```
 
-安装环境
+更新包管理器(可选择)和安装环境
 
 ```
 ./goecs.sh env
@@ -99,18 +99,28 @@ shell脚本的说明
 ```
 可用命令：
 
-./goecs.sh env            检查并安装的包：
-                          sudo  (几乎所有类 Unix 系统都有。)
-                          tar   (几乎所有类 Unix 系统都有。)
-                          unzip (几乎所有类 Unix 系统都有。)
-                          dd    (几乎所有类 Unix 系统都有。)
-                          fio   (几乎所有类 Unix 系统可以通过系统的包管理器安装。)
-                          sysbench  (几乎所有类 Unix 系统可以通过系统的包管理器安装。)
-                          geekbench (geekbench5) (仅支持 IPV4 环境，且内存大于 1GB 并需要持续联网，仅支持 amd64 和 arm64 架构。)
-                          speedtest (使用官方提供的二进制文件以获得更准确的测试结果。)
-                          ping  (使用官方提供的二进制文件以获得更准确的测试结果。)
-                          systemd-detect-virt 或 dmidecode (几乎所有类 Unix 系统都有，安装以获得更准确的测试结果。)
-                          事实上，sysbench/geekbench 是上述依赖项中唯一必须安装的，没有它们无法测试 CPU 分数。
+./goecs.sh env            检查并安装依赖包
+                          警告: 此命令会执行系统更新(可选择)，可能:
+                          1. 耗时较长
+                          2. 导致网络短暂中断
+                          3. 影响系统稳定性
+                          4. 影响后续系统启动
+                          对于内存小于1GB的系统，还可能导致:
+                          1. 系统卡死
+                          2. SSH连接中断
+                          3. 关键服务失败
+                          推荐：
+                          环境依赖安装过程中挂起执行
+
+                          必需组件:
+                          sysbench/geekbench (CPU性能测试必需)
+                          
+                          可选组件:
+                          sudo, tar, unzip, dd, fio
+                          speedtest (网络测试)
+                          ping (网络连通性测试)
+                          systemd-detect-virt/dmidecode (系统信息检测)
+
 ./goecs.sh install        安装 goecs 命令
 ./goecs.sh upgrade        升级 goecs 命令
 ./goecs.sh uninstall      卸载 goecs 命令

README_EN.md

@@ -87,18 +87,28 @@ Explanation of the shell script
 ```
 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.)
-                           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.)
-                           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.)
-                           systemd-detect-virt OR dmidecode (Almost all unix-like systems have it, for more accurate test results.)
-                           In fact, sysbench/geekbench is the only one of the above dependencies that must be installed, without which the CPU score cannot be tested.
+./goecs.sh env             Check and Install dependencies
+                           Warning: This command performs system update(optional), which may:
+                           1. Take considerable time
+                           2. Cause temporary network interruptions
+                           3. Impact system stability
+                           4. Affect subsequent system startups
+                           For systems with less than 1GB RAM, additional risks:
+                           1. System freeze
+                           2. SSH connection loss
+                           3. Critical service failures
+                           Recommended:
+                           Hanging execution during environment dependency installation
+                           
+                           Required components:
+                           sysbench/geekbench (Required for CPU testing)
+                           
+                           Optional components:
+                           sudo, tar, unzip, dd, fio
+                           speedtest (Network testing)
+                           ping (Network connectivity)
+                           systemd-detect-virt/dmidecode (System info detection)
+
 ./goecs.sh install         Install goecs command
 ./goecs.sh upgrade         Upgrade goecs command
 ./goecs.sh uninstall       Uninstall goecs command

basic/basiccheck.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-// 本包不在main中使用，仅做测试使用
+// 本包不在main中使用，仅做测试使用，真正调用的在 utils 中的 BasicsAndSecurityCheck
 func Basic(language string) {
 	ipInfo, _, _ := network.NetworkCheck("both", false, language)
 	systemInfo := system.CheckSystemInfo(language)

go.mod

@@ -5,9 +5,9 @@ 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.16-20240823051211
+	github.com/oneclickvirt/UnlockTests v0.0.18-20241118031951
 	github.com/oneclickvirt/backtrace v0.0.4-20240702140722
-	github.com/oneclickvirt/basics v0.0.7-20240821160408
+	github.com/oneclickvirt/basics v0.0.8-20241108124433
 	github.com/oneclickvirt/cputest v0.0.8-20240702070215
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
 	github.com/oneclickvirt/disktest v0.0.4-20240809053456

go.sum

@@ -104,12 +104,12 @@ github.com/nxtrace/NTrace-core v1.3.2 h1:8aU/IQFmPnwbaWGVBIJHwwVIWk+roo+9+lG+U0O
 github.com/nxtrace/NTrace-core v1.3.2/go.mod h1:qCVsgSs982jw02BVjTtN8mjSg5OIXW9TaUdISQrMnTw=
 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.16-20240823051211 h1:oDYlAXbUSt6JYTC+wcFDVWTacGuyBtWNfJhpKkrqNkU=
-github.com/oneclickvirt/UnlockTests v0.0.16-20240823051211/go.mod h1:UELwZDDiddSxe38boYOPl1FlrL0ptEZYSQwdE3MYvUM=
+github.com/oneclickvirt/UnlockTests v0.0.18-20241118031951 h1:3Tvl4s6Zwwbo0N1g4/YdaS8oZAUehcWRal/llzwWI6o=
+github.com/oneclickvirt/UnlockTests v0.0.18-20241118031951/go.mod h1:UELwZDDiddSxe38boYOPl1FlrL0ptEZYSQwdE3MYvUM=
 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.7-20240821160408 h1:IOqa7bBAkjhfru6arDsOTKB7qZ36ojfOP73kE+cDaqc=
-github.com/oneclickvirt/basics v0.0.7-20240821160408/go.mod h1:fUdVpU8gdjaZsTCyqnQBAbHc9BbbN8Fxr3sGPKooUpU=
+github.com/oneclickvirt/basics v0.0.8-20241108124433 h1:eKZcoNoa9uLWmfisk+qN/QOvSGT4ajCmZdZfIAcHG+o=
+github.com/oneclickvirt/basics v0.0.8-20241108124433/go.mod h1:fUdVpU8gdjaZsTCyqnQBAbHc9BbbN8Fxr3sGPKooUpU=
 github.com/oneclickvirt/cputest v0.0.8-20240702070215 h1:CcFpyVPlQkJ6vjFP17BRuJhh/afiJhOhZ0BW+TtfVDg=
 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=

goecs.go

@@ -39,7 +39,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.0.81"
+	ecsVersion                                                        = "v0.0.85"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -340,7 +340,7 @@ func main() {
 				if basicStatus {
 					utils.PrintCenteredTitle("系统基础信息", width)
 				}
-				basicInfo, securityInfo, nt3CheckType = utils.SecurityCheck(language, nt3CheckType, securityTestStatus)
+				basicInfo, securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, nt3CheckType, securityTestStatus)
 				if basicStatus {
 					fmt.Printf(basicInfo)
 				} else if (input == "6" || input == "9") && securityTestStatus {
@@ -481,7 +481,7 @@ func main() {
 				if basicStatus {
 					utils.PrintCenteredTitle("System-Basic-Information", width)
 				}
-				basicInfo, securityInfo, nt3CheckType = utils.SecurityCheck(language, nt3CheckType, securityTestStatus)
+				basicInfo, securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, nt3CheckType, securityTestStatus)
 				if basicStatus {
 					fmt.Printf(basicInfo)
 				} else if (input == "6" || input == "9") && securityTestStatus {

goecs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # From https://github.com/oneclickvirt/ecs
-# 2024.10.06
+# 2024.11.17
 
 # curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 
@@ -24,6 +24,7 @@ _red() { echo -e "\033[31m\033[01m$@\033[0m"; }
 _green() { echo -e "\033[32m\033[01m$@\033[0m"; }
 _yellow() { echo -e "\033[33m\033[01m$@\033[0m"; }
 _blue() { echo -e "\033[36m\033[01m$@\033[0m"; }
+reading() { read -rp "$(_green "$1")" "$2"; }
 
 check_cdn() {
     local o_url=$1
@@ -59,6 +60,32 @@ download_file() {
     return 0
 }
 
+get_memory_size() {
+    if [ -f /proc/meminfo ]; then
+        local mem_kb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
+        echo $((mem_kb / 1024)) # Convert to MB
+        return
+    fi
+    if command -v free >/dev/null 2>&1; then
+        local mem_kb=$(free -m | awk '/^Mem:/ {print $2}')
+        echo "$mem_kb" # Already in MB
+        return
+    fi
+    if command -v sysctl >/dev/null 2>&1; then
+        local mem_bytes=$(sysctl -n hw.memsize 2>/dev/null || sysctl -n hw.physmem 2>/dev/null)
+        if [ -n "$mem_bytes" ]; then
+            echo $((mem_bytes / 1024 / 1024)) # Convert to MB
+            return
+        fi
+    fi
+}
+
+cleanup_epel() {
+    _yellow "Cleaning up EPEL repositories..."
+    rm -f /etc/yum.repos.d/*epel*
+    yum clean all
+}
+
 goecs_check() {
     os=$(uname -s)
     arch=$(uname -m)
@@ -213,23 +240,41 @@ InstallSysbench() {
     else
         Var_OSRelease="unknown" # 未知系统分支
     fi
-
-    case "$Var_OSRelease" in
-    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) 
-        (yum -y install epel-release && yum -y install sysbench) || (dnf install epel-release -y && dnf install sysbench -y) ;;
-    fedora) 
-        dnf -y install sysbench ;;
-    arch) 
-        pacman -S --needed --noconfirm sysbench && pacman -S --needed --noconfirm libaio && ldconfig ;;
-    freebsd) 
-        pkg install -y sysbench ;;
-    alpinelinux) 
-        echo -e "${Msg_Warning}Sysbench Module not found, installing ..." && echo -e "${Msg_Warning}SysBench Current not support Alpine Linux, Skipping..." && Var_Skip_SysBench="1" ;;
-    *) 
-        _red "Sysbench Install Error: Unknown OS release: $Var_OSRelease" ;;
-    esac
+    local mem_size=$(get_memory_size)
+    if [ -z "$mem_size" ] || [ "$mem_size" -eq 0 ]; then
+        echo "Error: Unable to determine memory size or memory size is zero."
+    elif [ $mem_size -lt 1024 ]; then
+        _red "Warning: Your system has less than 1GB RAM (${mem_size}MB)"
+        reading "Do you want to continue with EPEL installation? (y/N): " confirm
+        if [[ ! $confirm =~ ^[Yy]$ ]]; then
+            _yellow "Skipping EPEL installation"
+            return 1
+        fi
+        case "$Var_OSRelease" in
+        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) 
+            (yum -y install epel-release && yum -y install sysbench) || (dnf install epel-release -y && dnf install sysbench -y) ;;
+        fedora) 
+            dnf -y install sysbench ;;
+        arch) 
+            pacman -S --needed --noconfirm sysbench && pacman -S --needed --noconfirm libaio && ldconfig ;;
+        freebsd) 
+            pkg install -y sysbench ;;
+        alpinelinux) 
+            echo -e "${Msg_Warning}Sysbench Module not found, installing ..." && echo -e "${Msg_Warning}SysBench Current not support Alpine Linux, Skipping..." && Var_Skip_SysBench="1" ;;
+        *) 
+            _red "Sysbench Install Error: Unknown OS release: $Var_OSRelease" ;;
+        esac
+        if [[ $SYSTEM =~ ^(CentOS|RHEL|AlmaLinux)$ ]]; then
+        _yellow "Installing EPEL repository..."
+            if ! yum -y install epel-release; then
+                _red "EPEL installation failed!"
+                cleanup_epel
+                _yellow "Attempting to continue without EPEL..."
+            fi
+        fi
+    fi
 }
 
 Check_SysBench() {
@@ -346,11 +391,25 @@ env_check() {
     
     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[int]} 2>/dev/null
+    _yellow "Warning: System update will be performed"
+    _yellow "This operation may:"
+    _yellow "1. Take significant time to complete"
+    _yellow "2. Cause temporary network interruptions"
+    _yellow "3. Impact system stability"
+    _yellow "4. Affect future system startup"
+    reading "Do you want to proceed with system update? (y/N): " update_confirm
+    if [[ ! $update_confirm =~ ^[Yy]$ ]]; then
+        _yellow "Skipping system update"
+        _yellow "Note: Some package installations may fail"
+    else
+        _green "Updating system package manager..."
+        if ! ${PACKAGE_UPDATE[int]} 2>/dev/null; then
+            _red "System update failed!"
+        fi
+    fi
     
     # 安装必要的命令
-    for cmd in sudo wget tar unzip systemd-detect-virt dd fio; do
+    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"
             ${PACKAGE_INSTALL[int]} "$cmd"
@@ -404,8 +463,8 @@ env_check() {
     fi
 
     if [ "$(uname -s)" = "Darwin" ]; then
-        echo "Detected MacOS. Installing sysbench and fio..."
-        brew install --force sysbench fio
+        echo "Detected MacOS. Installing sysbench iproute2mac fio..."
+        brew install --force sysbench iproute2mac fio
     else
         if ! grep -q "^net.ipv4.ping_group_range = 0 2147483647$" /etc/sysctl.conf; then
             echo "net.ipv4.ping_group_range = 0 2147483647" >> /etc/sysctl.conf
@@ -426,37 +485,59 @@ show_help() {
     cat <<"EOF"
 可用命令：
 
-./goecs.sh env            检查并安装的包：
-                          sudo  (几乎所有类 Unix 系统都有。)
-                          tar   (几乎所有类 Unix 系统都有。)
-                          unzip (几乎所有类 Unix 系统都有。)
-                          dd    (几乎所有类 Unix 系统都有。)
-                          fio   (几乎所有类 Unix 系统可以通过系统的包管理器安装。)
-                          sysbench  (几乎所有类 Unix 系统可以通过系统的包管理器安装。)
-                          geekbench (geekbench5) (仅支持 IPV4 环境，且内存大于 1GB 并需要持续联网，仅支持 amd64 和 arm64 架构。)
-                          speedtest (使用官方提供的二进制文件以获得更准确的测试结果。)
-                          ping  (使用官方提供的二进制文件以获得更准确的测试结果。)
-                          systemd-detect-virt 或 dmidecode (几乎所有类 Unix 系统都有，安装以获得更准确的测试结果。)
-                          事实上，sysbench/geekbench 是上述依赖项中唯一必须安装的，没有它们无法测试 CPU 分数。
+./goecs.sh env            检查并安装依赖包
+                          警告: 此命令会执行系统更新(可选择)，可能:
+                          1. 耗时较长
+                          2. 导致网络短暂中断
+                          3. 影响系统稳定性
+                          4. 影响后续系统启动
+                          对于内存小于1GB的系统，还可能导致:
+                          1. 系统卡死
+                          2. SSH连接中断
+                          3. 关键服务失败
+                          推荐：
+                          环境依赖安装过程中挂起执行
+
+                          必需组件:
+                          sysbench/geekbench (CPU性能测试必需)
+                          
+                          可选组件:
+                          sudo, tar, unzip, dd, fio
+                          speedtest (网络测试)
+                          ping (网络连通性测试)
+                          systemd-detect-virt/dmidecode (系统信息检测)
+
 ./goecs.sh install        安装 goecs 命令
 ./goecs.sh upgrade        升级 goecs 命令
 ./goecs.sh uninstall      卸载 goecs 命令
 ./goecs.sh help           显示此消息
 
+[English version follows...]
+
 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.)
-                           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.)
-                           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.)
-                           systemd-detect-virt OR dmidecode (Almost all unix-like systems have it, for more accurate test results.)
-                           In fact, sysbench/geekbench is the only one of the above dependencies that must be installed, without which the CPU score cannot be tested without which the CPU score cannot be tested.
+./goecs.sh env             Check and Install dependencies
+                           Warning: This command performs system update(optional), which may:
+                           1. Take considerable time
+                           2. Cause temporary network interruptions
+                           3. Impact system stability
+                           4. Affect subsequent system startups
+                           For systems with less than 1GB RAM, additional risks:
+                           1. System freeze
+                           2. SSH connection loss
+                           3. Critical service failures
+                           Recommended:
+                           Hanging execution during environment dependency installation
+                           
+                           Required components:
+                           sysbench/geekbench (Required for CPU testing)
+                           
+                           Optional components:
+                           sudo, tar, unzip, dd, fio
+                           speedtest (Network testing)
+                           ping (Network connectivity)
+                           systemd-detect-virt/dmidecode (System info detection)
+
 ./goecs.sh install         Install goecs command
 ./goecs.sh upgrade         Upgrade goecs command
 ./goecs.sh uninstall       Uninstall goecs command

utils/utils.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/imroc/req/v3"
 	"github.com/oneclickvirt/UnlockTests/uts"
+	"github.com/oneclickvirt/basics/ipv6"
 	"github.com/oneclickvirt/basics/system"
 	. "github.com/oneclickvirt/defaultset"
 	"github.com/oneclickvirt/security/network"
@@ -128,12 +129,12 @@ func CheckChina(enableLogger bool) bool {
 	return selectChina
 }
 
-// SecurityCheck 执行安全检查
-func SecurityCheck(language, nt3CheckType string, securtyCheckStatus bool) (string, string, string) {
+// BasicsAndSecurityCheck 执行安全检查
+func BasicsAndSecurityCheck(language, nt3CheckType string, securtyCheckStatus bool) (string, string, string) {
 	var wgt sync.WaitGroup
 	var ipInfo, securityInfo, systemInfo string
 	var err error
-	wgt.Add(2)
+	wgt.Add(1)
 	go func() {
 		defer wgt.Done()
 		ipInfo, securityInfo, err = network.NetworkCheck("both", securtyCheckStatus, language)
@@ -141,12 +142,17 @@ func SecurityCheck(language, nt3CheckType string, securtyCheckStatus bool) (stri
 			fmt.Println(err.Error())
 		}
 	}()
+	wgt.Add(1)
 	go func() {
 		defer wgt.Done()
 		systemInfo = system.CheckSystemInfo(language)
 	}()
 	wgt.Wait()
+	ipv6Info, errv6 := ipv6.GetIPv6Mask(language)
 	basicInfo := systemInfo + ipInfo
+	if errv6 == nil && ipv6Info != "" {
+		basicInfo += ipv6Info
+	}
 	if strings.Contains(ipInfo, "IPV4") && strings.Contains(ipInfo, "IPV6") {
 		uts.IPV4 = true
 		uts.IPV6 = true