From 833893593fd88f9bdc22370962997e0c3a2f546e Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Fri, 10 May 2024 17:01:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=AE=9D=E5=A1=94=E7=8E=AF=E5=A2=83=E4=B8=8B=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?xray-core=20reality?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 7c6a13a..4513060 100644
--- a/install.sh
+++ b/install.sh
@@ -557,7 +557,10 @@ checkBTPanel() {
                         ln -s "/www/server/panel/vhost/cert/${btDomain}/privkey.pem" "/etc/v2ray-agent/tls/${btDomain}.key"
                     fi
 
-                    nginxStaticPath="/www/wwwroot/${btDomain}/"
+                    nginxStaticPath="/www/wwwroot/${btDomain}/html/"
+
+                    mkdir -p "/www/wwwroot/${btDomain}/html/"
+
                     if [[ -f "/www/wwwroot/${btDomain}/.user.ini" ]]; then
                         chattr -i "/www/wwwroot/${btDomain}/.user.ini"
                     fi
@@ -5551,6 +5554,7 @@ unInstall() {
         menu
         exit 0
     fi
+    checkBTPanel
     echoContent yellow " ---> 脚本不会删除acme相关配置，删除请手动执行 [rm -rf /root/.acme.sh]"
     handleNginx stop
     if [[ -z $(pgrep -f "nginx") ]]; then
@@ -7723,7 +7727,9 @@ customXrayInstall() {
         if [[ -n "${btDomain}" ]]; then
             echoContent skyBlue "\n进度  3/${totalProgress} : 检测到宝塔面板/1Panel，跳过申请TLS步骤"
             handleXray stop
-            customPortFunction
+            if [[ "${selectCustomInstallType}" != ",7," ]]; then
+                customPortFunction
+            fi
         else
             # 申请tls
             if [[ "${selectCustomInstallType}" != ",7," ]]; then
@@ -8816,7 +8822,14 @@ initRealityClientServersName() {
         if [[ "${realityServerNameCurrentDomainStatus}" == "y" ]]; then
             realityServerName="${domain}"
             if [[ "${selectCoreType}" == "1" ]]; then
-                realityDomainPort="${port}"
+                if [[ -n "${port}" ]]; then
+                    realityDomainPort="${port}"
+                elif [[ -z "${subscribePort}" ]]; then
+                    echo
+                    installSubscribe
+                    readNginxSubscribe
+                    realityDomainPort="${subscribePort}"
+                fi
             fi
 
             if [[ "${selectCoreType}" == "2" && -z "${subscribePort}" ]]; then
@@ -9153,7 +9166,7 @@ menu() {
     cd "$HOME" || exit
     echoContent red "\n=============================================================="
     echoContent green "作者：mack-a"
-    echoContent green "当前版本：v3.2.48"
+    echoContent green "当前版本：v3.2.49"
     echoContent green "Github：https://github.com/mack-a/v2ray-agent"
     echoContent green "描述：八合一共存脚本\c"
     showInstallStatus