From 018b62fa1452366207c4deebbf3d47af170b1ff7 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Tue, 26 Dec 2023 14:57:27 +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=E4=B8=8B=20tuic=E5=92=8Chysteria2=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=85=B1=E5=AD=98=E9=97=AE=E9=A2=98=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?5.Reality=E7=AE=A1=E7=90=86=E6=95=99=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index d4d8c88..fe4f0a5 100644
--- a/install.sh
+++ b/install.sh
@@ -3314,8 +3314,7 @@ singBoxTuicInstall() {
     totalProgress=5
     installSingBox 1
     selectCustomInstallType=9
-    #    initSingBoxTuicConfig 2
-    initSingBoxConfig custom 2
+    initSingBoxConfig custom 2 true
     installSingBoxService 3
     reloadCore
     showAccounts 4
@@ -3335,7 +3334,7 @@ singBoxHysteria2Install() {
     totalProgress=5
     installSingBox 1
     selectCustomInstallType=6
-    initSingBoxConfig custom 2
+    initSingBoxConfig custom 2 true
     installSingBoxService 3
     reloadCore
     showAccounts 4
@@ -8075,11 +8074,10 @@ xrayCoreRealityInstall() {
 }
 
 # reality管理
-
 manageReality() {
     readInstallProtocolType
     if ! echo "${currentInstallProtocolType}" | grep -q -E "7|8" || [[ -z "${coreInstallType}" ]]; then
-        echoContent red "\n ---> 请先安装Reality协议"
+        echoContent red "\n ---> 请先安装Reality协议，参考教程 https://www.v2ray-agent.com/archives/1680104902581#heading-11"
         exit 0
     fi
 
@@ -8163,7 +8161,6 @@ manageHysteria() {
     echoContent red "=============================================================="
     read -r -p "请选择:" installHysteria2Status
     if [[ "${installHysteria2Status}" == "1" ]]; then
-        unInstallHysteriaCore
         singBoxHysteria2Install
     elif [[ "${installHysteria2Status}" == "2" && "${hysteria2Status}" == "true" ]]; then
         unInstallSingBox hysteria2
@@ -8187,7 +8184,6 @@ manageTuic() {
     echoContent red "=============================================================="
     read -r -p "请选择:" installTuicStatus
     if [[ "${installTuicStatus}" == "1" ]]; then
-        unInstallTuicCore
         singBoxTuicInstall
     elif [[ "${installTuicStatus}" == "2" && "${tuicStatus}" == "true" ]]; then
         unInstallSingBox tuic
@@ -8293,7 +8289,7 @@ menu() {
     cd "$HOME" || exit
     echoContent red "\n=============================================================="
     echoContent green "作者：mack-a"
-    echoContent green "当前版本：v3.1.16"
+    echoContent green "当前版本：v3.1.17"
     echoContent green "Github：https://github.com/mack-a/v2ray-agent"
     echoContent green "描述：八合一共存脚本\c"
     showInstallStatus