diff --git a/install.sh b/install.sh index e14b111..df0dd4f 100644 --- a/install.sh +++ b/install.sh @@ -3545,12 +3545,8 @@ EOF # sing-box Tuic安装 singBoxTuicInstall() { - if [[ "${coreInstallType}" == "2" ]]; then - echoContent red "\n ---> 此功能仅支持Xray-core内核,请全部安装或者个性化安装Hysteria2" - exit 0 - fi - if ! echo "${currentInstallProtocolType}" | grep -q ",0," || [[ -z "${coreInstallType}" ]]; then - echoContent red "\n ---> 由于证书环境依赖,如安装Tuic,请先安装Xray-core的VLESS_TCP_TLS_Vision" + if ! echo "${currentInstallProtocolType}" | grep -qE ",0,|,1,|,2,|,3,|,4,|,5,|,6,|,9,|,10,"; then + echoContent red "\n ---> 由于需要依赖证书,如安装Tuic,请先安装带有TLS标识协议" exit 0 fi @@ -3565,12 +3561,8 @@ singBoxTuicInstall() { # sing-box hy2安装 singBoxHysteria2Install() { - if [[ "${coreInstallType}" == "2" ]]; then - echoContent red "\n ---> 此功能仅支持Xray-core内核,请全部安装或者个性化安装Hysteria2" - exit 0 - fi - if ! echo "${currentInstallProtocolType}" | grep -q ",0," || [[ -z "${coreInstallType}" ]]; then - echoContent red "\n ---> 由于证书环境依赖,如安装Hysteria2,请先安装Xray-core的VLESS_TCP_TLS_Vision" + if ! echo "${currentInstallProtocolType}" | grep -qE ",0,|,1,|,2,|,3,|,4,|,5,|,6,|,9,|,10,"; then + echoContent red "\n ---> 由于需要依赖证书,如安装Hysteria2,请先安装带有TLS标识协议" exit 0 fi @@ -8653,11 +8645,12 @@ manageHysteria() { echoContent red "\n==============================================================" local hysteria2Status= if [[ -n "${singBoxConfigPath}" ]] && [[ -f "/etc/v2ray-agent/sing-box/conf/config/06_hysteria2_inbounds.json" ]]; then - echoContent yellow " 依赖第三方sing-box\n" + echoContent yellow "依赖第三方sing-box\n" echoContent yellow "1.重新安装" echoContent yellow "2.卸载" hysteria2Status=true else + echoContent yellow "依赖sing-box内核\n" echoContent yellow "1.安装" fi @@ -8676,11 +8669,12 @@ manageTuic() { echoContent red "\n==============================================================" local tuicStatus= if [[ -n "${singBoxConfigPath}" ]] && [[ -f "/etc/v2ray-agent/sing-box/conf/config/09_tuic_inbounds.json" ]]; then - echoContent yellow " 依赖第三方sing-box\n" + echoContent yellow "依赖sing-box内核\n" echoContent yellow "1.重新安装" echoContent yellow "2.卸载" tuicStatus=true else + echoContent yellow "依赖sing-box内核\n" echoContent yellow "1.安装" fi @@ -8793,7 +8787,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v3.2.35" + echoContent green "当前版本:v3.2.36" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:八合一共存脚本\c" showInstallStatus @@ -8810,13 +8804,9 @@ menu() { fi echoContent yellow "2.任意组合安装" - if [[ "${coreInstallType}" != "2" ]]; then - echoContent yellow "4.Hysteria2管理" - echoContent yellow "5.REALITY管理" - echoContent yellow "6.Tuic管理" - else - echoContent yellow "5.REALITY管理" - fi + echoContent yellow "4.Hysteria2管理" + echoContent yellow "5.REALITY管理" + echoContent yellow "6.Tuic管理" echoContent skyBlue "-------------------------工具管理-----------------------------" echoContent yellow "7.用户管理"