From 5215cbf8b9f70c7d014a6221c424b8d50999cb2e Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Tue, 19 Dec 2023 14:14:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E5=A4=8Dx?=
 =?UTF-8?q?ray-core=20reality=E8=AE=A2=E9=98=85=E6=97=A0=E6=B3=95=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98=E3=80=81=E7=A7=BB=E9=99=A4=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E7=AE=A1=E7=90=86reality=E7=9A=84=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E3=80=81=E5=85=BC=E5=AE=B9=E4=B8=8D=E5=90=8C=E6=A0=B8=E5=BF=83?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E8=AE=A2=E9=98=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/install.sh b/install.sh
index e39b3a5..e0039cd 100644
--- a/install.sh
+++ b/install.sh
@@ -683,9 +683,13 @@ readConfigHostPathUUID() {
         fi
 
         # reality
-        if [[ -n "${realityStatus}" && -z "${currentClients}" ]]; then
-            currentUUID=$(jq -r .inbounds[0].settings.clients[0].id ${configPath}07_VLESS_vision_reality_inbounds.json)
-            currentClients=$(jq -r .inbounds[0].settings.clients ${configPath}07_VLESS_vision_reality_inbounds.json)
+        if echo ${currentInstallProtocolType} | grep -q 7; then
+            #            currentUUID=$(jq -r .inbounds[0].settings.clients[0].id ${configPath}07_VLESS_vision_reality_inbounds.json)
+            #            currentClients=$(jq -r .inbounds[0].settings.clients ${configPath}07_VLESS_vision_reality_inbounds.json)
+            xrayVLESSRealityVisionPort=$(jq -r .inbounds[0].port ${configPath}07_VLESS_vision_reality_inbounds.json)
+            if [[ "${currentPort}" == "${xrayVLESSRealityVisionPort}" ]]; then
+                xrayVLESSRealityVisionPort="${currentDefaultPort}"
+            fi
         fi
     elif [[ "${coreInstallType}" == "2" ]]; then
         currentHost=$(jq -r .inbounds[0].tls.server_name ${configPath}${frontingType}.json)
@@ -4555,7 +4559,7 @@ showAccounts() {
 
             echoContent skyBlue "\n ---> 账号:${email}"
             echo
-            defaultBase64Code vlessReality "${currentDefaultPort}${singBoxVLESSRealityVisionPort}" "${email}" "$(echo "${user}" | jq -r .id//.uuid)"
+            defaultBase64Code vlessReality "${xrayVLESSRealityVisionPort}${singBoxVLESSRealityVisionPort}" "${email}" "$(echo "${user}" | jq -r .id//.uuid)"
         done
     fi
     # VLESS reality gRPC
@@ -4568,7 +4572,7 @@ showAccounts() {
 
             echoContent skyBlue "\n ---> 账号:${email}"
             echo
-            defaultBase64Code vlessRealityGRPC "${currentDefaultPort}${singBoxVLESSRealityGRPCPort}" "${email}" "$(echo "${user}" | jq -r .id//.uuid)"
+            defaultBase64Code vlessRealityGRPC "${xrayVLESSRealityVisionPort}${singBoxVLESSRealityGRPCPort}" "${email}" "$(echo "${user}" | jq -r .id//.uuid)"
         done
     fi
     # tuic
@@ -6797,7 +6801,7 @@ customXrayInstall() {
         if ! echo "${selectCustomInstallType}" | grep -q "0"; then
             selectCustomInstallType="0${selectCustomInstallType}"
         fi
-
+        unInstallSubscribe
         checkBTPanel
         totalProgress=12
         installTools 1
@@ -6886,7 +6890,7 @@ selectCoreInstall() {
 
 # xray-core 安装
 xrayCoreInstall() {
-
+    unInstallSubscribe
     checkBTPanel
     selectCustomInstallType=
     totalProgress=13
@@ -7163,6 +7167,10 @@ server {
 EOF
     fi
 }
+# 卸载订阅
+unInstallSubscribe() {
+    rm -rf ${nginxConfigPath}subscribe.conf >/dev/null 2>&1
+}
 
 # 添加订阅
 addSubscribeMenu() {
@@ -8212,7 +8220,7 @@ menu() {
     cd "$HOME" || exit
     echoContent red "\n=============================================================="
     echoContent green "作者：mack-a"
-    echoContent green "当前版本：v3.1.5-beta"
+    echoContent green "当前版本：v3.1.6-beta"
     echoContent green "Github：https://github.com/mack-a/v2ray-agent"
     echoContent green "描述：八合一共存脚本\c"
     showInstallStatus
@@ -8230,7 +8238,7 @@ menu() {
 
     echoContent yellow "2.任意组合安装"
     echoContent yellow "4.Hysteria2管理"
-    echoContent yellow "5.REALITY管理"
+    #    echoContent yellow "5.REALITY管理"
     echoContent yellow "6.Tuic管理"
     echoContent skyBlue "-------------------------工具管理-----------------------------"
     echoContent yellow "7.账号管理"
@@ -8265,9 +8273,9 @@ menu() {
     4)
         manageHysteria
         ;;
-    5)
-        manageReality 1
-        ;;
+        #    5)
+        #        manageReality 1
+        #        ;;
     6)
         manageTuic
         ;;