From ecc69f6d8047434f05a32abce07fd6bcc919da00 Mon Sep 17 00:00:00 2001 From: axx1019 Date: Fri, 13 Oct 2023 23:34:12 +0800 Subject: [PATCH 1/5] Update install.sh --- install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index ae2e43907f..d998a766f7 100644 --- a/install.sh +++ b/install.sh @@ -19,7 +19,7 @@ elif cat /etc/issue | grep -Eqi "ubuntu"; then release="ubuntu" elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then release="centos" -elif cat /proc/version | grep -Eqi "debian"; then +elif cat /proc/version | grep -Eqi "debian"; then release="debian" elif cat /proc/version | grep -Eqi "ubuntu"; then release="ubuntu" @@ -65,10 +65,10 @@ elif [[ x"${release}" == x"ubuntu" ]]; then if [[ ${os_version} -lt 16 ]]; then echo -e "${red}请使用 Ubuntu 16 或更高版本的系统!${plain}\n" && exit 1 fi -elif [[ x"${release}" == x"debian" ]]; then - if [[ ${os_version} -lt 8 ]]; then - echo -e "${red}请使用 Debian 8 或更高版本的系统!${plain}\n" && exit 1 - fi +#elif [[ x"${release}" == x"debian" ]]; then +# if [[ ${os_version} -lt 8 ]]; then +# echo -e "${red}请使用 Debian 8 或更高版本的系统!${plain}\n" && exit 1 #屏蔽检测debian需要正式版本,使其可以使用与testing版本 +# fi fi install_base() { From 53ab87ca15b76329ea3319200125f1e492e18714 Mon Sep 17 00:00:00 2001 From: axx1019 Date: Fri, 13 Oct 2023 23:35:09 +0800 Subject: [PATCH 2/5] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index d998a766f7..8b2d8e23eb 100644 --- a/install.sh +++ b/install.sh @@ -67,7 +67,7 @@ elif [[ x"${release}" == x"ubuntu" ]]; then fi #elif [[ x"${release}" == x"debian" ]]; then # if [[ ${os_version} -lt 8 ]]; then -# echo -e "${red}请使用 Debian 8 或更高版本的系统!${plain}\n" && exit 1 #屏蔽检测debian需要正式版本,使其可以使用与testing版本 +# echo -e "${red}请使用 Debian 8 或更高版本的系统!${plain}\n" && exit 1 #屏蔽检测debian需要正式版本,使其可以使用于testing版本,后期使用systemctl restart x-ui语法进行控制 # fi fi From 4c1b85f9b180ef5b4083d216f5fa7096bfedf558 Mon Sep 17 00:00:00 2001 From: axx1019 Date: Fri, 13 Oct 2023 23:38:45 +0800 Subject: [PATCH 3/5] Update x-ui.sh --- x-ui.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x-ui.sh b/x-ui.sh index 914c068a02..58c653a902 100644 --- a/x-ui.sh +++ b/x-ui.sh @@ -67,10 +67,10 @@ elif [[ x"${release}" == x"ubuntu" ]]; then if [[ ${os_version} -lt 16 ]]; then LOGE "请使用 Ubuntu 16 或更高版本的系统!\n" && exit 1 fi -elif [[ x"${release}" == x"debian" ]]; then - if [[ ${os_version} -lt 8 ]]; then - LOGE "请使用 Debian 8 或更高版本的系统!\n" && exit 1 - fi +#elif [[ x"${release}" == x"debian" ]]; then +# if [[ ${os_version} -lt 8 ]]; then +# LOGE "请使用 Debian 8 或更高版本的系统!\n" && exit 1 #屏蔽Debian版本检测,使其可以用于testing版本 +# fi fi confirm() { From 5fd6d84d874c2a3ff89e7b0e0dc3b14cb99f50a3 Mon Sep 17 00:00:00 2001 From: axx1019 Date: Thu, 28 Nov 2024 19:48:25 +0800 Subject: [PATCH 4/5] Update install.sh --- install.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index 8b2d8e23eb..145b05a369 100644 --- a/install.sh +++ b/install.sh @@ -57,14 +57,14 @@ if [[ -z "$os_version" && -f /etc/lsb-release ]]; then os_version=$(awk -F'[= ."]+' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) fi -if [[ x"${release}" == x"centos" ]]; then - if [[ ${os_version} -le 6 ]]; then - echo -e "${red}请使用 CentOS 7 或更高版本的系统!${plain}\n" && exit 1 - fi -elif [[ x"${release}" == x"ubuntu" ]]; then - if [[ ${os_version} -lt 16 ]]; then - echo -e "${red}请使用 Ubuntu 16 或更高版本的系统!${plain}\n" && exit 1 - fi +#if [[ x"${release}" == x"centos" ]]; then +# if [[ ${os_version} -le 6 ]]; then +# echo -e "${red}请使用 CentOS 7 或更高版本的系统!${plain}\n" && exit 1 +# fi +#elif [[ x"${release}" == x"ubuntu" ]]; then +# if [[ ${os_version} -lt 16 ]]; then +# echo -e "${red}请使用 Ubuntu 16 或更高版本的系统!${plain}\n" && exit 1 +# fi #elif [[ x"${release}" == x"debian" ]]; then # if [[ ${os_version} -lt 8 ]]; then # echo -e "${red}请使用 Debian 8 或更高版本的系统!${plain}\n" && exit 1 #屏蔽检测debian需要正式版本,使其可以使用于testing版本,后期使用systemctl restart x-ui语法进行控制 From 1c0b791ba42dbb95bda9680c58f2e88ed9267d43 Mon Sep 17 00:00:00 2001 From: axx1019 Date: Thu, 28 Nov 2024 19:50:55 +0800 Subject: [PATCH 5/5] Update x-ui.sh --- x-ui.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/x-ui.sh b/x-ui.sh index 58c653a902..9b0c28bdab 100644 --- a/x-ui.sh +++ b/x-ui.sh @@ -59,14 +59,14 @@ if [[ -z "$os_version" && -f /etc/lsb-release ]]; then os_version=$(awk -F'[= ."]+' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) fi -if [[ x"${release}" == x"centos" ]]; then - if [[ ${os_version} -le 6 ]]; then - LOGE "请使用 CentOS 7 或更高版本的系统!\n" && exit 1 - fi -elif [[ x"${release}" == x"ubuntu" ]]; then - if [[ ${os_version} -lt 16 ]]; then - LOGE "请使用 Ubuntu 16 或更高版本的系统!\n" && exit 1 - fi +#if [[ x"${release}" == x"centos" ]]; then +# if [[ ${os_version} -le 6 ]]; then +# LOGE "请使用 CentOS 7 或更高版本的系统!\n" && exit 1 +# fi +#elif [[ x"${release}" == x"ubuntu" ]]; then +# if [[ ${os_version} -lt 16 ]]; then +# LOGE "请使用 Ubuntu 16 或更高版本的系统!\n" && exit 1 +# fi #elif [[ x"${release}" == x"debian" ]]; then # if [[ ${os_version} -lt 8 ]]; then # LOGE "请使用 Debian 8 或更高版本的系统!\n" && exit 1 #屏蔽Debian版本检测,使其可以用于testing版本