From 41db82dacda2604e21e056047d896d63aced6e2d Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Tue, 23 Aug 2022 12:21:17 +0800
Subject: [PATCH] Update menu.sh

---
 menu.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/menu.sh b/menu.sh
index f500c04..b1f6004 100644
--- a/menu.sh
+++ b/menu.sh
@@ -429,7 +429,7 @@ check_dependencies(){
 
 # 检测 IPv4 IPv6 信息，WARP Ineterface 开启，普通还是 Plus账户 和 IP 信息
 ip4_info(){
-	unset IP4 LAN4 COUNTRY4 ASNORG4 TRACE4 PLUS4 WARPSTATUS4
+	unset IP4 COUNTRY4 ASNORG4 TRACE4 PLUS4 WARPSTATUS4
 	IP4=$(curl -ks4m8 https://ip.gs/json $INTERFACE)
 	WAN4=$(expr "$IP4" : '.*ip\":\"\([^"]*\).*')
 	COUNTRY4=$(expr "$IP4" : '.*country\":\"\([^"]*\).*')
@@ -442,7 +442,7 @@ ip4_info(){
 	}
 
 ip6_info(){
-	unset IP6 LAN6 COUNTRY6 ASNORG6 TRACE6 PLUS6 WARPSTATUS6
+	unset IP6 COUNTRY6 ASNORG6 TRACE6 PLUS6 WARPSTATUS6
 	IP6=$(curl -ks6m8 https://ip.gs/json)
 	WAN6=$(expr "$IP6" : '.*ip\":\"\([^"]*\).*')
 	COUNTRY6=$(expr "$IP6" : '.*country\":\"\([^"]*\).*')
@@ -939,13 +939,8 @@ EOF
 	# 判断机器原生状态类型
 	LAN4=$(ip route get 192.168.193.10 2>/dev/null | grep -oP 'src \K\S+')
 	LAN6=$(ip route get 2606:4700:d0::a29f:c001 2>/dev/null | grep -oP 'src \K\S+')
-	[ -n "$LAN4" ] && IPV4=1 || IPV4=0
-	[ -n "$LAN6" ] && IPV6=1 || IPV6=0
-	[ -n "$LAN4" ] && ping -c2 -W3 162.159.193.10 >/dev/null 2>&1 && CDN=-4 || CDN=-6
-
-	# 判断当前 IPv4 与 IPv6 ，IP归属 及 WARP 方案, Linux Client 是否开启
-	[ "$IPV4" = 1 ] && ip4_info
-	[ "$IPV6" = 1 ] && ip6_info
+	[ -n "$LAN6" ] && IPV6=1 && ping6 -c2 -w10 2606:4700:d0::a29f:c001 >/dev/null 2>&1 && CDN=-6 && ip6_info || IPV6=0
+	[ -n "$LAN4" ] && IPV4=1 && ping -c2 -W3 162.159.193.10 >/dev/null 2>&1 && CDN=-4 && ip4_info || IPV4=0
 	[[ $L = C && -n "$COUNTRY4" ]] && COUNTRY4=$(translate "$COUNTRY4")
 	[[ $L = C && -n "$COUNTRY6" ]] && COUNTRY6=$(translate "$COUNTRY6")