From d77a1000ce816a25e04575d30dcf3957ed154ad1 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Fri, 13 Sep 2024 11:05:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E5=A4=8Dsi?=
 =?UTF-8?q?ngbox=E5=B1=95=E7=A4=BA=E8=AE=A2=E9=98=85=E4=B8=8D=E5=85=A8?=
 =?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 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 578380d..d726287 100644
--- a/install.sh
+++ b/install.sh
@@ -2064,7 +2064,7 @@ updateSELinuxHTTPPortT() {
 # 操作Nginx
 handleNginx() {
 
-    if [[ -z $(pgrep -f "nginx") ]] && [[ "$1" == "start" ]]; then
+    if ! echo "${selectCustomInstallType}" | grep -qwE ",7,|,8,|,7,8," && [[ -z $(pgrep -f "nginx") ]] && [[ "$1" == "start" ]]; then
         if [[ "${release}" == "alpine" ]]; then
             rc-service nginx start 2>/etc/v2ray-agent/nginx_error.log
         else
@@ -5885,7 +5885,8 @@ unInstall() {
     rm -rf /etc/v2ray-agent
     rm -rf ${nginxConfigPath}alone.conf
     rm -rf ${nginxConfigPath}checkPortOpen.conf >/dev/null 2>&1
-    rm -rf ${nginxConfigPath}subscribe.conf >/dev/null 2>&1
+    unInstallSubscribe
+    #    rm -rf ${nginxConfigPath}subscribe.conf >/dev/null 2>&1
 
     if [[ -d "${nginxStaticPath}" && -f "${nginxStaticPath}/check" ]]; then
         rm -rf "${nginxStaticPath}*"
@@ -8047,6 +8048,7 @@ customSingBoxInstall() {
         handleNginx start
         # 生成账号
         checkGFWStatue 8
+        unInstallSubscribe
         showAccounts 9
     else
         echoContent red " ---> 输入不合法"
@@ -8146,6 +8148,7 @@ customXrayInstall() {
         handleXray start
         # 生成账号
         checkGFWStatue 11
+        unInstallSubscribe
         showAccounts 12
     else
         echoContent red " ---> 输入不合法"
@@ -8224,6 +8227,7 @@ xrayCoreInstall() {
     handleNginx start
     # 生成账号
     checkGFWStatue 11
+    unInstallSubscribe
     showAccounts 12
 }
 
@@ -8263,9 +8267,8 @@ singBoxInstall() {
     handleSingBox stop
     sleep 2
     handleSingBox start
-
+    unInstallSubscribe
     # 生成账号
-    #    checkGFWStatue 12
     showAccounts 9
 }
 
@@ -9395,6 +9398,7 @@ xrayCoreRealityInstall() {
     sleep 2
     # 启动
     handleXray start
+    unInstallSubscribe
     # 生成账号
     showAccounts 8
 }
@@ -9625,7 +9629,7 @@ menu() {
     cd "$HOME" || exit
     echoContent red "\n=============================================================="
     echoContent green "作者：mack-a"
-    echoContent green "当前版本：v3.3.17"
+    echoContent green "当前版本：v3.3.18"
     echoContent green "Github：https://github.com/mack-a/v2ray-agent"
     echoContent green "描述：八合一共存脚本\c"
     showInstallStatus