From a702f13dba6f3fe9e15c60fb3ec9f860f15faa46 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Tue, 23 Mar 2021 15:06:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA=E3=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E3=80=81=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/install.sh b/install.sh
index b093082..b5d220e 100644
--- a/install.sh
+++ b/install.sh
@@ -214,6 +214,55 @@ readConfigHostPathUUID() {
 	fi
 }
 
+# 状态展示
+showInstallStatus() {
+	if [[ -n "${coreInstallType}" ]]; then
+		if [[ "${coreInstallType}" == 1 ]]; then
+			if [[ -n $(pgrep -f xray/xray) ]]; then
+				echoContent yellow "核心：Xray-core[运行中]"
+			else
+				echoContent yellow "核心：Xray-core[未运行]"
+			fi
+
+		elif [[ "${coreInstallType}" == 2 || "${coreInstallType}" == 3 ]]; then
+			if [[ -n $(pgrep -f v2ray/v2ray) ]]; then
+				echoContent yellow "核心：v2ray-core[运行中]"
+			else
+				echoContent yellow "核心：v2ray-core[未运行]"
+			fi
+		fi
+		# 读取协议类型
+		readInstallProtocolType
+
+		if [[ -n ${currentInstallProtocolType} ]]; then
+			echoContent yellow "已安装协议：\c"
+		fi
+		if echo ${currentInstallProtocolType} | grep -q 0; then
+			if [[ "${coreInstallType}" == 2 ]]; then
+				echoContent yellow "VLESS+TCP[TLS] \c"
+			else
+				echoContent yellow "VLESS+TCP[TLS/XTLS] \c"
+			fi
+		fi
+
+		if echo ${currentInstallProtocolType} | grep -q 1; then
+			echoContent yellow "VLESS+WS[TLS] \c"
+		fi
+
+		if echo ${currentInstallProtocolType} | grep -q 2; then
+			echoContent yellow "VMess+TCP[TLS] \c"
+		fi
+
+		if echo ${currentInstallProtocolType} | grep -q 3; then
+			echoContent yellow "VMess+WS[TLS] \c"
+		fi
+
+		if echo ${currentInstallProtocolType} | grep -q 4; then
+			echoContent yellow "Trojan+TCP/WS[TLS]"
+		fi
+	fi
+}
+
 # 清理旧残留
 cleanUp() {
 	if [[ "$1" == "v2rayClean" ]]; then
@@ -704,8 +753,8 @@ installCronTLS() {
 	crontab -l >/etc/v2ray-agent/backup_crontab.cron
 	sed '/v2ray-agent/d;/acme.sh/d' /etc/v2ray-agent/backup_crontab.cron >/etc/v2ray-agent/backup_crontab.cron
 	echo "30 1 * * * /bin/bash /etc/v2ray-agent/install.sh RenewTLS" >>/etc/v2ray-agent/backup_crontab.cron
-    crontab /etc/v2ray-agent/backup_crontab.cron
-    echoContent green " ---> 添加定时维护证书成功"
+	crontab /etc/v2ray-agent/backup_crontab.cron
+	echoContent green " ---> 添加定时维护证书成功"
 }
 
 # 更新证书
@@ -2189,11 +2238,6 @@ showAccounts() {
 	fi
 }
 
-# 状态展示
-#showInstallStatus() {
-#
-#}
-
 # 更新伪装站
 updateNginxBlog() {
 	echoContent skyBlue "\n进度 $1/${totalProgress} : 更换伪装站点"
@@ -3516,11 +3560,17 @@ menu() {
 	cd "$HOME" || exit
 	echoContent red "\n=============================================================="
 	echoContent green "作者：mack-a"
-	echoContent green "当前版本：v2.4.6"
+	echoContent green "当前版本：v2.4.7"
 	echoContent green "Github：https://github.com/mack-a/v2ray-agent"
 	echoContent green "描述：七合一共存脚本"
+	showInstallStatus
 	echoContent red "=============================================================="
-	echoContent yellow "1.安装"
+	if [[ -n "${coreInstallType}" ]]; then
+		echoContent yellow "1.重新安装"
+	else
+		echoContent yellow "1.安装"
+	fi
+
 	echoContent yellow "2.任意组合安装"
 	echoContent skyBlue "-------------------------工具管理-----------------------------"
 	echoContent yellow "3.账号管理"