Nlbench.sh

@@ -113,17 +113,10 @@ detect_os() {
         . /etc/lsb-release
         os_type=$DISTRIB_ID
         os_version=$DISTRIB_RELEASE
-    elif [ -f /etc/redhat-release ]; then
-        os_type=$(cat /etc/redhat-release | cut -d ' ' -f 1)
-        os_version=$(cat /etc/redhat-release | sed 's/.*release \([0-9\.]*\).*/\1/')
-    elif [ -f /etc/gentoo-release ]; then
-        os_type="gentoo"
-        os_version=$(cat /etc/gentoo-release | cut -d ' ' -f 5)
     else
-        os_type=$(uname -s)
+        echo -e "${RED}无法检测操作系统类型和版本。${NC}"
-        os_version=$(uname -r)
+        return 1
     fi
-    os_type=$(echo "$os_type" | tr '[:upper:]' '[:lower:]')
     echo -e "${YELLOW}检测到的系统: $os_type $os_version${NC}"
 }
 
@@ -131,14 +124,15 @@ detect_os() {
 update_system() {
     detect_os || return 1
 
+    # 根据操作系统类型选择更新命令
     case "${os_type,,}" in
         ubuntu|debian|linuxmint|elementary|pop)
             update_cmd="apt-get update"
             upgrade_cmd="apt-get upgrade -y"
             install_cmd="apt-get install -y"
             ;;
-        centos|rhel|fedora|rocky|almalinux|openeuler)
+        fedora|centos|rhel|ol|rocky|almalinux)
-            if command -v dnf &>/dev/null; then
+            if [ "${os_version%%.*}" -ge 22 ] || [ "${os_version%%.*}" -ge 8 ]; then
                 update_cmd="dnf check-update"
                 upgrade_cmd="dnf upgrade -y"
                 install_cmd="dnf install -y"
@@ -163,16 +157,6 @@ update_system() {
             upgrade_cmd="apk upgrade"
             install_cmd="apk add"
             ;;
-        gentoo)
-            update_cmd="emerge --sync"
-            upgrade_cmd="emerge -uDN @world"
-            install_cmd="emerge"
-            ;;
-        cloudlinux)
-            update_cmd="yum check-update"
-            upgrade_cmd="yum upgrade -y"
-            install_cmd="yum install -y"
-            ;;
         *)
             echo -e "${RED}不支持的 Linux 发行版: $os_type${NC}"
             return 1
@@ -203,34 +187,18 @@ install_dependencies() {
     update_system || echo -e "${RED}系统更新失败。继续安装依赖项。${NC}"
     
     # 安装依赖
-    local dependencies=("curl" "wget" "iperf3" "bc")
+    local dependencies=("curl" "wget" "iperf3")
     
-    case "${os_type,,}" in
+    for dep in "${dependencies[@]}"; do
-        gentoo)
+        if ! command -v "$dep" &> /dev/null; then
-            for dep in "${dependencies[@]}"; do
+            echo -e "${YELLOW}正在安装 $dep...${NC}"
-                if ! emerge -p $dep &>/dev/null; then
+            if ! sudo $install_cmd "$dep"; then
-                    echo -e "${YELLOW}正在安装 $dep...${NC}"
+                echo -e "${RED}无法安装 $dep。请手动安装此依赖项。${NC}"
-                    if ! sudo emerge $dep; then
+            fi
-                        echo -e "${RED}无法安装 $dep。请手动安装此依赖项。${NC}"
+        else
-                    fi
+            echo -e "${GREEN}$dep 已安装。${NC}"
-                else
+        fi
-                    echo -e "${GREEN}$dep 已安装。${NC}"
+    done
-                fi
-            done
-            ;;
-        *)
-            for dep in "${dependencies[@]}"; do
-                if ! command -v "$dep" &> /dev/null; then
-                    echo -e "${YELLOW}正在安装 $dep...${NC}"
-                    if ! sudo $install_cmd "$dep"; then
-                        echo -e "${RED}无法安装 $dep。请手动安装此依赖项。${NC}"
-                    fi
-                else
-                    echo -e "${GREEN}$dep 已安装。${NC}"
-                fi
-            done
-            ;;
-    esac
     
     echo -e "${GREEN}依赖项检查和安装完成。${NC}"
     clear

README.md

@@ -2,7 +2,7 @@
 
 这是NodeLoc提供给各位用户的主机聚合测评脚本，可一键自动对主机进行Yabs、融合怪、IP质量、流媒体解锁，三网测速，iperf3，回程路由等测评，测评结束后将会保存结果为MarkDown文件，方便快速上传至NodeLoc论坛。
 
-**版本：** 2024-08-13 v1.1.2
+**版本：** 2024-07-18 v1.0.4
 
 **Github地址：** https://github.com/everett7623/nodeloc_vps_test