From b58ee45e3a7f1c40530c5dfd94caf60c676845b6 Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Sat, 9 Apr 2022 18:34:46 +0800
Subject: [PATCH] Update unlock.sh

---
 unlock.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/unlock.sh b/unlock.sh
index 778dca5..f67f943 100644
--- a/unlock.sh
+++ b/unlock.sh
@@ -182,8 +182,11 @@ check_warp(){
 		
 		# 在已安装 Client 的前提下，区分模式 Mode
 		if type -P warp-cli >/dev/null 2>&1; then
-			if [[ -e /etc/wireguard/luban ]]; then
-				if [[ ! $(ip a) =~ 'CloudflareWARP' ]]; then
+			if [[ $(warp-cli --accept-tos settings) =~ WarpProxy ]]; then
+				[[ ! $(ss -nltp) =~ 'warp-svc' ]] && warp-cli --accept-tos connect >/dev/null 2>&1
+				[[ $(ss -nltp) =~ 'warp-svc' ]] && CLIENT_PORT=$(ss -nltp | grep warp-svc | grep -oP '127.0*\S+' | cut -d: -f2) && STATUS[2]=1 || STATUS[2]=0
+			
+			else	if [[ ! $(ip a) =~ 'CloudflareWARP' ]]; then
 					warp-cli --accept-tos connect >/dev/null 2>&1
 					warp-cli --accept-tos enable-always-on >/dev/null 2>&1
 					sleep 5
@@ -192,9 +195,6 @@ check_warp(){
 					ip -4 rule add table main suppress_prefixlength 0
 				fi
 				[[ $(ip a) =~ 'CloudflareWARP' ]] && STATUS[2]=1 || STATUS[2]=0
-		
-			else [[ ! $(ss -nltp) =~ 'warp-svc' ]] && warp-cli --accept-tos connect >/dev/null 2>&1
-				[[ $(ss -nltp) =~ 'warp-svc' ]] && CLIENT_PORT=$(ss -nltp | grep warp-svc | grep -oP '127.0*\S+' | cut -d: -f2) && STATUS[2]=1 || STATUS[2]=0
 			fi
 		else STATUS[2]=0
 		fi