From b1f996b8640afbb1c3a62c7b7dbdadaf565de920 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Fri, 25 Jun 2021 16:42:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=89=E8=A3=85=E6=9F=A5=E7=9C=8B=E5=B8=90?=
 =?UTF-8?q?=E5=8F=B7=E6=97=B6=E4=B8=8D=E5=B1=95=E7=A4=BAtrojan=E7=9A=84?=
 =?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 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 6ef32c5..58e30c5 100644
--- a/install.sh
+++ b/install.sh
@@ -229,15 +229,18 @@ readInstallProtocolType() {
 		if echo ${row} | grep -q VMess_WS_inbounds; then
 			currentInstallProtocolType=${currentInstallProtocolType}'3'
 		fi
+		if echo ${row} | grep -q trojan_TCP_inbounds; then
+			currentInstallProtocolType=${currentInstallProtocolType}'4'
+		fi
 		if echo ${row} | grep -q VLESS_gRPC_inbounds; then
 			currentInstallProtocolType=${currentInstallProtocolType}'5'
 		fi
 
 	done < <(ls ${configPath} | grep inbounds.json | awk -F "[.]" '{print $1}')
 
-	if [[ -f "/etc/v2ray-agent/trojan/trojan-go" ]] && [[ -f "/etc/v2ray-agent/trojan/config_full.json" ]]; then
-		currentInstallProtocolType=${currentInstallProtocolType}'4'
-	fi
+#	if [[ -f "/etc/v2ray-agent/trojan/trojan-go" ]] && [[ -f "/etc/v2ray-agent/trojan/config_full.json" ]]; then
+#		currentInstallProtocolType=${currentInstallProtocolType}'4'
+#	fi
 }
 
 # 检查文件目录以及path路径
@@ -4047,7 +4050,7 @@ menu() {
 	cd "$HOME" || exit
 	echoContent red "\n=============================================================="
 	echoContent green "作者：mack-a"
-	echoContent green "当前版本：v2.5.10-dev_remove_trojan-go"
+	echoContent green "当前版本：v2.5.10-dev_remove_trojan-go_1"
 	echoContent green "Github：https://github.com/mack-a/v2ray-agent"
 	echoContent green "描述：八合一共存脚本\c"
 	showInstallStatus