From 9555952bc301ac7a6b1d913a971733656ccf75a7 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Wed, 3 Jan 2024 22:48:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=AA=E6=80=A7=E5=8C=96=E5=AE=89=E8=A3=85=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E3=80=81=E8=A7=A3=E9=99=A4sing-box=E4=BB=BB=E6=84=8F=E9=97=A8?= =?UTF-8?q?=E7=AD=89=E5=88=86=E6=B5=81=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index 5284a45..167a7c1 100644 --- a/install.sh +++ b/install.sh @@ -6395,29 +6395,25 @@ routingToolsMenu() { ;; 4) if [[ -n "${singBoxConfigPath}" ]]; then - echoContent red "\n ---> 此功能仅支持Xray-core内核,请等待后续更新" - exit 0 + echoContent red "\n ---> 此功能不支持Hysteria2、Tuic" fi dokodemoDoorRouting 1 ;; 5) if [[ -n "${singBoxConfigPath}" ]]; then - echoContent red "\n ---> 此功能仅支持Xray-core内核,请等待后续更新" - exit 0 + echoContent red "\n ---> 此功能不支持Hysteria2、Tuic" fi dnsRouting 1 ;; 6) if [[ -n "${singBoxConfigPath}" ]]; then - echoContent red "\n ---> 此功能仅支持Xray-core内核,请等待后续更新" - exit 0 + echoContent red "\n ---> 此功能不支持Hysteria2、Tuic" fi vmessWSRouting 1 ;; 7) if [[ -n "${singBoxConfigPath}" ]]; then - echoContent red "\n ---> 此功能仅支持Xray-core内核,请等待后续更新" - exit 0 + echoContent red "\n ---> 此功能不支持Hysteria2、Tuic" fi sniRouting 1 ;; @@ -6944,6 +6940,10 @@ customSingBoxInstall() { echoContent red " ---> 请使用英文逗号分隔" exit 0 fi + if [[ "${selectCustomInstallType}" != "10" ]] && ((${#selectCustomInstallType} >= 2)) && ! echo "${selectCustomInstallType}" | grep -q ","; then + echoContent red " ---> 多选请使用英文逗号分隔" + exit 0 + fi if [[ "${selectCustomInstallType: -1}" != "," ]]; then selectCustomInstallType="${selectCustomInstallType}," fi @@ -6997,6 +6997,10 @@ customXrayInstall() { echoContent red " ---> 请使用英文逗号分隔" exit 0 fi + if ((${#selectCustomInstallType} >= 2)) && ! echo "${selectCustomInstallType}" | grep -q ","; then + echoContent red " ---> 多选请使用英文逗号分隔" + exit 0 + fi if [[ "${selectCustomInstallType: -1}" != "," ]]; then selectCustomInstallType="${selectCustomInstallType}," fi @@ -8428,7 +8432,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v3.1.23" + echoContent green "当前版本:v3.1.24" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:八合一共存脚本\c" showInstallStatus