From 52eb9bc83a4421b677fe3701af4fe1a2260c7204 Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Fri, 5 Aug 2022 18:49:16 +0800
Subject: [PATCH] Update menu.sh

---
 menu.sh | 40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/menu.sh b/menu.sh
index f79b0e0..f049c03 100644
--- a/menu.sh
+++ b/menu.sh
@@ -469,11 +469,7 @@ proxy_info(){
 	[[ $L = C ]] && PROXYCOUNTRY=$(translate "$PROXYCOUNTRY")
 	PROXYASNORG=$(expr "$PROXYJASON" : '.*asn_org\":\"\([^"]*\).*')
 	ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null)
-		if [[ $ACCOUNT =~ 'Limited' ]]; then
-			QUOTA=$(expr "$ACCOUNT" : '.*Quota:\s\([0-9]\{1,\}\)\s.*')
-			[[ $QUOTA -gt 10000000000000 ]] && QUOTA="$((QUOTA/1000000000000)) TiB" ||  QUOTA="$((QUOTA/1000000000)) GiB"
-			AC='+'
-		fi
+	[[ $ACCOUNT =~ 'Limited' ]] && AC='+' && check_quota
 	fi
 
 	if type -P wireproxy >/dev/null 2>&1; then
@@ -486,7 +482,7 @@ proxy_info(){
 	PROXYASNORG2=$(expr "$PROXYJASON2" : '.*asn_org\":\"\([^"]*\).*')
 	TRACE42=$(eval echo "\$(curl -sx socks5h://localhost:$(ss -nltp | grep wireproxy | grep -oP '127.0*\S+' | cut -d: -f2) https://www.cloudflare.com/cdn-cgi/trace)")
 		if [[ $TRACE42 =~ plus ]]; then
-			grep -sq 'Device name' /etc/wireguard/info.log && AC2='+' || AC2=' Teams'
+			grep -sq 'Device name' /etc/wireguard/info.log && AC2='+' && check_quota || AC2=' Teams'
 		fi
 	fi
 	}
@@ -825,11 +821,7 @@ proxy_onoff(){
 		if [[ $(warp-cli --accept-tos settings) =~ WarpProxy ]]; then
 			proxy_info
 			ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null)
-			if [[ $ACCOUNT =~ 'Limited' ]]; then
-				QUOTA=$(expr "$ACCOUNT" : '.*Quota:\s\([0-9]\{1,\}\)\s.*')
-				[[ $QUOTA -gt 10000000000000 ]] && QUOTA="$((QUOTA/1000000000000)) TiB" ||  QUOTA="$((QUOTA/1000000000)) GiB"
-				AC='+'
-			fi
+			[[ $ACCOUNT =~ 'Limited' ]] && AC='+' && CHECK_TYPE=1 && check_quota
 			[[ $(ss -nltp) =~ 'warp-svc' ]] && green " ${T[${L}90]}\n $(eval echo "${T[${L}27]}") "
 			[[ -n "$QUOTA" ]] && green " ${T[${L}63]}：$QUOTA "
 		exit 0
@@ -839,11 +831,7 @@ proxy_onoff(){
 			ip4_info
 			[[ $L = C && -n "$COUNTRY4" ]] && COUNTRY4=$(translate "$COUNTRY4")
 			ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null)
-			if [[ $ACCOUNT =~ 'Limited' ]]; then
-				QUOTA=$(expr "$ACCOUNT" : '.*Quota:\s\([0-9]\{1,\}\)\s.*')
-				[[ $QUOTA -gt 10000000000000 ]] && QUOTA="$((QUOTA/1000000000000)) TiB" ||  QUOTA="$((QUOTA/1000000000)) GiB"
-				AC='+'
-			fi
+			[[ $ACCOUNT =~ 'Limited' ]] && AC='+' && CHECK_TYPE=1 && check_quota
 			[[ $(ip a) =~ 'CloudflareWARP' ]] && green " ${T[${L}90]}\n $(eval echo "${T[${L}169]}") "
 			[[ -n "$QUOTA" ]] && green " ${T[${L}63]}：$QUOTA "
 		exit 0
@@ -1633,11 +1621,7 @@ proxy(){
 
 	# 结果提示，脚本运行时间，次数统计
 	ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null)
-	if [[ $ACCOUNT =~ 'Limited' ]]; then
-		QUOTA=$(expr "$ACCOUNT" : '.*Quota:\s\([0-9]\{1,\}\)\s.*')
-		[[ $QUOTA -gt 10000000000000 ]] && QUOTA="$((QUOTA/1000000000000)) TiB" ||  QUOTA="$((QUOTA/1000000000)) GiB"
-		AC='+'
-	fi
+	[[ $ACCOUNT =~ 'Limited' ]] && CHECK_TYPE=1 && AC='+' && check_quota
 
 	if [[ $LUBAN = 1 ]]; then
 		[[ $L = C ]] && COUNTRY4=$(translate "$COUNTRY4")
@@ -1692,7 +1676,7 @@ wireproxy_solution(){
 # 查 WARP+ 余额流量接口
 check_quota(){
 	if [ $CHECK_TYPE = 1 ]; then
-		QUOTA=$(grep -oP 'Quota: \K\d+' <<< $CLI_ACCOUNT)
+		QUOTA=$(grep -oP 'Quota: \K\d+' <<< $ACCOUNT)
 	else
 		ACCESS_TOKEN=$(grep 'access_token' /etc/wireguard/wgcf-account.toml | cut -d \" -f2)
 		DEVICE_ID=$(grep 'device_id' /etc/wireguard/wgcf-account.toml | cut -d \" -f2)
@@ -1735,15 +1719,14 @@ update(){
 
 	client_account(){
 	[[ $ARCHITECTURE = arm64 ]] && red " ${T[${L}101]} " && exit 1
-	CLI_ACCOUNT=$(warp-cli --accept-tos account)
-	[[ $CLI_ACCOUNT =~ Limited ]] && CHECK_TYPE=1 && check_quota && red " $(eval echo ${T[${L}97]}) " && exit 1
+	ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null)
+	[[ $ACCOUNT =~ Limited ]] && CHECK_TYPE=1 && check_quota && red " $(eval echo ${T[${L}97]}) " && exit 1
 	update_license
 	warp-cli --accept-tos set-license "$LICENSE" >/dev/null 2>&1; sleep 1
 	ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null)
 	if [[ $ACCOUNT =~ 'Limited' ]]; then
 	echo "$LICENSE" >/etc/wireguard/license
-	QUOTA=$(expr "$ACCOUNT" : '.*Quota:\s\([0-9]\{1,\}\)\s.*')
-	[[ $QUOTA -gt 10000000000000 ]] && QUOTA="$((QUOTA/1000000000000)) TB" ||  QUOTA="$((QUOTA/1000000000)) GB"
+	CHECK_TYPE=1 && check_quota
 	green " ${T[${L}62]}\n ${T[${L}63]}：$QUOTA "
 
 	else red " ${T[${L}36]} "
@@ -1853,7 +1836,7 @@ menu(){
 	green "	IPv4：$WAN4 $WARPSTATUS4 $COUNTRY4  $ASNORG4 "
 	green "	IPv6：$WAN6 $WARPSTATUS6 $COUNTRY6  $ASNORG6 "
 	[[ $TRACE4$TRACE6 =~ plus ]] && green "	$(eval echo "${T[${L}114]}")	$PLUSINFO "
-	[[ $TRACE4$TRACE6 =~ on ]] && green "	${T[${L}115]} " 	
+	[[ $TRACE4$TRACE6 =~ on ]] && green "	${T[${L}115]} "
 	[[ $PLAN != 3 ]] && green "	${T[${L}116]} "
 	[[ $CLIENT = 0 ]] && green "	${T[${L}112]} "
 	[[ $CLIENT = 2 ]] && green "	$(eval echo "${T[${L}113]}") "
@@ -1861,7 +1844,8 @@ menu(){
 	[[ $CLIENT = 5 ]] && green "	WARP$AC ${T[${L}24]}	$(eval echo "${T[${L}169]}") "
 	[[ $WIREPROXY = 0 ]] && green "	${T[${L}160]} "
 	[[ $WIREPROXY = 2 ]] && green "	${T[${L}161]} "
-	[[ $WIREPROXY = 3 ]] && green "	WARP$AC2 ${T[${L}159]}	$(eval echo "${T[${L}162]}") "	
+	[[ $WIREPROXY = 3 ]] && green "	WARP$AC2 ${T[${L}159]}	$(eval echo "${T[${L}162]}") "
+	[[ $AC$AC2 =~ 1 ]] && green " ${T[${L}63]}：$QUOTA "
  	red "\n======================================================================================================================\n"
 	green " 1.  $OPTION1\n 2.  $OPTION2\n 3.  $OPTION3\n 4.  $OPTION4\n 5.  $OPTION5\n 6.  $OPTION6\n 7.  $OPTION7\n 8.  $OPTION8\n 9.  $OPTION9 \n 10. $OPTION10\n 11. $OPTION11\n 12. $OPTION12\n 13. $OPTION13\n 14. $OPTION14\n 0. $OPTION0\n "
 	reading " ${T[${L}50]} " CHOOSE1