From f09f2c78c16bab5309ce0a9bf2365d2365a8b4a4 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Wed, 3 Jul 2024 00:30:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E5=A4=8Dsi?= =?UTF-8?q?ng-box=E5=AE=89=E8=A3=85Reality=E5=90=8E=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index cabef02..4c9fdb0 100644 --- a/install.sh +++ b/install.sh @@ -358,7 +358,7 @@ readNginxSubscribe() { subscribePort=$(grep "listen" "${nginxConfigPath}subscribe.conf" | awk '{print $2}') subscribeDomain=$(grep "server_name" "${nginxConfigPath}subscribe.conf" | awk '{print $2}') subscribeDomain=${subscribeDomain//;/} - if [[ "${subscribeDomain}" != "${currentHost}" ]]; then + if [[ -n "${currentHost}" && "${subscribeDomain}" != "${currentHost}" ]]; then subscribePort= subscribeType= else @@ -1306,8 +1306,10 @@ checkPortOpen() { local domain=$2 local checkPortOpenResult= allowPort "${port}" + if [[ -z "${btDomain}" ]]; then + handleNginx stop # 初始化nginx配置 touch ${nginxConfigPath}checkPortOpen.conf cat <${nginxConfigPath}checkPortOpen.conf @@ -9400,7 +9402,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v3.3.6" + echoContent green "当前版本:v3.3.7" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:八合一共存脚本\c" showInstallStatus