From de3a3e0e2fce25e7cb79892ebd6644feecf47570 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Sun, 7 Jan 2024 12:02:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E5=A4=8DVM?=
 =?UTF-8?q?ess=E7=AB=AF=E5=8F=A3=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81=E4=BF=AE=E5=A4=8Dnaive=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index b1476f5..a1cd556 100644
--- a/install.sh
+++ b/install.sh
@@ -4665,10 +4665,15 @@ showAccounts() {
 
             echoContent skyBlue "\n ---> 账号:${email}"
             echo
+            local vmessPort=${currentDefaultPort}
+            if [[ "${coreInstallType}" == "2" ]]; then
+                vmessPort="${singBoxVMessWSPort}"
+            fi
+
             local count=
             while read -r line; do
                 if [[ -n "${line}" ]]; then
-                    defaultBase64Code vmessws "${singBoxVMessWSPort}" "${email}${count}" "$(echo "${user}" | jq -r .id//.uuid)" "${line}" "${path}"
+                    defaultBase64Code vmessws "${vmessPort}" "${email}${count}" "$(echo "${user}" | jq -r .id//.uuid)" "${line}" "${path}"
                     count=$((count + 1))
                 fi
             done < <(echo "${currentAdd}" | tr ',' '\n')
@@ -4760,7 +4765,7 @@ showAccounts() {
 
     fi
     # naive
-    if echo ${currentInstallProtocolType} | grep -q ",10," || [[ -n "${tuicPort}" ]]; then
+    if echo ${currentInstallProtocolType} | grep -q ",10," || [[ -n "${singBoxNaivePort}" ]]; then
         echoContent skyBlue "\n================================  naive TLS [推荐，不支持ClashMeta]  ================================\n"
 
         jq -r -c '.inbounds[]|.users[]' "${configPath}10_naive_inbounds.json" | while read -r user; do
@@ -8448,7 +8453,7 @@ menu() {
     cd "$HOME" || exit
     echoContent red "\n=============================================================="
     echoContent green "作者：mack-a"
-    echoContent green "当前版本：v3.1.25"
+    echoContent green "当前版本：v3.1.26"
     echoContent green "Github：https://github.com/mack-a/v2ray-agent"
     echoContent green "描述：八合一共存脚本\c"
     showInstallStatus