From 3e19b744970a4884e1f1ae9881ff0f6b8745e759 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 21 Jan 2025 12:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=92=E5=8A=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cnbench.sh | 2 ++ Nlbench.sh | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Cnbench.sh b/Cnbench.sh index 3345bdb..1c1a313 100644 --- a/Cnbench.sh +++ b/Cnbench.sh @@ -251,6 +251,8 @@ install_dependencies() { done ;; *) + install_cmd="apt-get install -yq" + export DEBIAN_FRONTEND=noninteractive for dep in "${dependencies[@]}"; do if ! command -v "$dep" &> /dev/null; then echo -e "${YELLOW}正在安装 $dep...${NC}" diff --git a/Nlbench.sh b/Nlbench.sh index edde5e4..4f40c7e 100644 --- a/Nlbench.sh +++ b/Nlbench.sh @@ -202,7 +202,6 @@ update_system() { # 定义支持的操作系统类型 SUPPORTED_OS=("ubuntu" "debian" "linuxmint" "elementary" "pop" "centos" "rhel" "fedora" "rocky" "almalinux" "openeuler" "opensuse" "sles" "arch" "manjaro" "alpine" "gentoo" "cloudlinux") -# 安装依赖 install_dependencies() { echo -e "${YELLOW}正在检查并安装必要的依赖项...${NC}" @@ -225,11 +224,11 @@ install_dependencies() { case "${os_type,,}" in gentoo) - install_cmd="emerge" + install_cmd="emerge --quiet" for dep in "${dependencies[@]}"; do - if ! emerge -p $dep &>/dev/null; then + if ! emerge -p "$dep" &>/dev/null; then echo -e "${YELLOW}正在安装 $dep...${NC}" - if ! sudo $install_cmd $dep; then + if ! sudo $install_cmd "$dep"; then echo -e "${RED}无法安装 $dep。请手动安装此依赖项。${NC}" fi else @@ -238,9 +237,9 @@ install_dependencies() { done ;; alpine) - install_cmd="apk add" + install_cmd="apk add --no-cache" for dep in "${dependencies[@]}"; do - if ! command -v "$dep" &> /dev/null; then + if ! command -v "$dep" &>/dev/null; then echo -e "${YELLOW}正在安装 $dep...${NC}" if ! sudo $install_cmd "$dep"; then echo -e "${RED}无法安装 $dep。请手动安装此依赖项。${NC}" @@ -251,8 +250,10 @@ install_dependencies() { done ;; *) + install_cmd="apt-get install -yq" + export DEBIAN_FRONTEND=noninteractive for dep in "${dependencies[@]}"; do - if ! command -v "$dep" &> /dev/null; then + if ! command -v "$dep" &>/dev/null; then echo -e "${YELLOW}正在安装 $dep...${NC}" if ! sudo $install_cmd "$dep"; then echo -e "${RED}无法安装 $dep。请手动安装此依赖项。${NC}" @@ -268,6 +269,7 @@ install_dependencies() { clear } + # 获取IP地址和ISP信息 ip_address_and_isp() { ipv4_address=$(curl -s --max-time 5 ipv4.ip.sb)