From 6105ac81d9edd959146a4543049a00fcfbae6e8a Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:19:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=84=9A=E6=9C=AC=E5=AE=89=E8=A3=85=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=AE=9D=E5=A1=94=E5=BC=82=E5=B8=B8=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 4cb4452d..8b0ef29b 100644 --- a/install.sh +++ b/install.sh @@ -419,7 +419,7 @@ readInstallProtocolType() { xrayVLESSRealityXHTTPort= xrayVLESSRealityXHTTPServerName= -# currentRealityXHTTPPrivateKey= + # currentRealityXHTTPPrivateKey= currentRealityXHTTPPublicKey= currentRealityPrivateKey= @@ -461,7 +461,7 @@ readInstallProtocolType() { xrayVLESSRealityXHTTPServerName=$(jq -r .inbounds[0].streamSettings.realitySettings.serverNames[0] "${row}.json") currentRealityXHTTPPublicKey=$(jq -r .inbounds[0].streamSettings.realitySettings.publicKey "${row}.json") -# currentRealityXHTTPPrivateKey=$(jq -r .inbounds[0].streamSettings.realitySettings.privateKey "${row}.json") + # currentRealityXHTTPPrivateKey=$(jq -r .inbounds[0].streamSettings.realitySettings.privateKey "${row}.json") # if [[ "${coreInstallType}" == "2" ]]; then # frontingType=03_VLESS_WS_inbounds @@ -2136,7 +2136,8 @@ handleNginx() { systemctl stop nginx fi sleep 0.5 - if [[ -n $(pgrep -f "nginx") ]]; then + + if [[ -z ${btDomain} && -n $(pgrep -f "nginx") ]]; then pgrep -f "nginx" | xargs kill -9 fi echoContent green " ---> Nginx关闭成功" @@ -9737,7 +9738,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v3.3.30" + echoContent green "当前版本:v3.3.31" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:八合一共存脚本\c" showInstallStatus