From 210625310a2db2e4c588ed15efb4cef68de2c01f Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:09:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A3=80=E6=B5=8B=E3=80=81=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?warp=EF=BC=8C=E5=A2=9E=E5=8A=A0warp=E9=87=8D=E5=90=AF=E5=8D=A1?=
 =?UTF-8?q?=E6=AD=BB=E7=9A=84=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 52d25e0..55852ff 100644
--- a/install.sh
+++ b/install.sh
@@ -39,7 +39,7 @@ checkSystem() {
 		if [[ -f "/etc/centos-release" ]];then
 			centosVersion=$(rpm -q centos-release | awk -F "[-]" '{print $3}' | awk -F "[.]" '{print $1}')
 
-			if [[ -z "${centosVersion}" ]] && grep </etc/centos-release "release 8"; then
+			if [[ -z "${centosVersion}" ]] && grep </etc/centos-release -q -i "release 8"; then
 				centosVersion=8
 			fi
 		fi
@@ -3557,7 +3557,12 @@ installSniffing(){
 # warp分流
 warpRouting(){
 	echoContent skyBlue "\n进度  $1/${totalProgress} : WARP分流"
-
+	echoContent red "=============================================================="
+	echoContent yellow "# 注意事项\n"
+	echoContent yellow "1.官方warp经过几轮测试有bug，重启会导致warp失效，并且无法启动，也有可能CPU使用率暴涨"
+	echoContent yellow "2.不重启机器可正常使用，如果非要使用官方warp，建议不重启机器"
+	echoContent yellow "3.有的机器重启后仍正常使用"
+	echoContent yellow "4.重启后无法使用，也可卸载重新安装"
 	# 安装warp
 	if [[ -z $(which warp-cli) ]];then
 		echo
@@ -3621,6 +3626,9 @@ EOF
 		echoContent green " ---> 添加成功"
 
 	elif [[ "${warpStatus}" == "2" ]]; then
+
+		${removeType} cloudflare-warp >/dev/null 2>&1
+
 		unInstallRouting warp-socks-out
 
 		unInstallOutbounds warp-socks-out
@@ -4318,7 +4326,7 @@ menu() {
 	cd "$HOME" || exit
 	echoContent red "\n=============================================================="
 	echoContent green "作者：mack-a"
-	echoContent green "当前版本：v2.5.20"
+	echoContent green "当前版本：v2.5.21"
 	echoContent green "Github：https://github.com/mack-a/v2ray-agent"
 	echoContent green "描述：八合一共存脚本\c"
 	showInstallStatus
@@ -4341,7 +4349,7 @@ menu() {
 	echoContent yellow "6.更新证书"
 	echoContent yellow "7.更换CDN节点"
 	echoContent yellow "8.IPv6分流"
-	echoContent yellow "9.WARP分流[不可用]"
+	echoContent yellow "9.WARP分流"
 	echoContent yellow "10.流媒体工具"
 	echoContent yellow "11.添加新端口"
 	echoContent yellow "12.BT下载管理"
@@ -4381,9 +4389,9 @@ menu() {
 	8)
 		ipv6Routing 1
 		;;
-#	9)
-#		warpRouting 1
-#		;;
+	9)
+		warpRouting 1
+		;;
 	10)
 		streamingToolbox 1
 		;;