admin/warp
1
0
Fork 0
mirror of https://gitlab.com/fscarmen/warp.git synced 2026-06-25 15:42:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update t.sh

Browse Source 
Former-commit-id: 1874d376e445664797d103730d428ba403c0d3cc
This commit is contained in:
fscarmen
2021-11-05 10:48:15 +08:00
committed by GitHub
parent 268972db68
commit db5107faeb
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
old/t.sh
+13 -10
View File
@@ -183,10 +183,10 @@ uninstall(){
IP6=$(curl -s6m5 https://ip.gs/json)
WAN4=$(echo $IP4 | cut -d \" -f4)
WAN6=$(echo $IP6 | cut -d \" -f4)
COUNTRY4=$(echo $IP4 | cut -d \" -f10)
COUNTRY6=$(echo $IP6 | cut -d \" -f10)
ASNORG4=$(echo $IP4 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' |sed "s/[,\":]//g")
ASNORG6=$(echo $IP6 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' |sed "s/[,\":]//g")
[[ $LANGUAGE != 2 ]] && COUNTRY4=$(echo $IP4 | cut -d \" -f10) || COUNTRY4=$(curl -s "http://fanyi.youdao.com/translate?&doctype=json&type=AUTO&i=$(echo $IP4 | cut -d \" -f10)" | cut -d\" -f 18)
[[ $LANGUAGE != 2 ]] && COUNTRY6=$(echo $IP6 | cut -d \" -f10) || COUNTRY6=$(curl -s "http://fanyi.youdao.com/translate?&doctype=json&type=AUTO&i=$(echo $IP6 | cut -d \" -f10)" | cut -d\" -f 18)
ASNORG4=$(echo $IP4 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' | sed "s/[,\":]//g")
ASNORG6=$(echo $IP6 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' | sed "s/[,\":]//g")
[[ -z $(wg) ]] >/dev/null 2>&1 && green " $T45\n IPv4：$WAN4 $COUNTRY4 $ASNORG4\n IPv6：$WAN6 $COUNTRY6 $ASNORG6 " || red " $T46 "
}
@@ -227,10 +227,10 @@ net(){
done
WAN4=$(echo $IP4 | cut -d \" -f4)
WAN6=$(echo $IP6 | cut -d \" -f4)
COUNTRY4=$(echo $IP4 | cut -d \" -f10)
COUNTRY6=$(echo $IP6 | cut -d \" -f10)
ASNORG4=$(echo $IP4 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' |sed "s/[,\":]//g")
ASNORG6=$(echo $IP6 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' |sed "s/[,\":]//g")
[[ $LANGUAGE != 2 ]] && COUNTRY4=$(echo $IP4 | cut -d \" -f10) || COUNTRY4=$(curl -s "http://fanyi.youdao.com/translate?&doctype=json&type=AUTO&i=$(echo $IP4 | cut -d \" -f10)" | cut -d\" -f 18)
[[ $LANGUAGE != 2 ]] && COUNTRY6=$(echo $IP6 | cut -d \" -f10) || COUNTRY6=$(curl -s "http://fanyi.youdao.com/translate?&doctype=json&type=AUTO&i=$(echo $IP6 | cut -d \" -f10)" | cut -d\" -f 18)
ASNORG4=$(echo $IP4 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' | sed "s/[,\":]//g")
ASNORG6=$(echo $IP6 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' | sed "s/[,\":]//g")
green " $T14\n IPv4:$WAN4 $COUNTRY4 $ASNORG4\n IPv6:$WAN6 $COUNTRY6 $ASNORG6 "
}
@@ -300,14 +300,17 @@ VIRT=$(systemd-detect-virt 2>/dev/null | tr A-Z a-z)
IP4=$(curl -s4m4 https://ip.gs/json) &&
WAN4=$(echo $IP4 | cut -d \" -f4) &&
COUNTRY4=$(echo $IP4 | cut -d \" -f10) &&
ASNORG4=$(echo $IP4 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' |sed "s/[,\":]//g") &&
ASNORG4=$(echo $IP4 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' | sed "s/[,\":]//g") &&
TRACE4=$(curl -s4 https://www.cloudflare.com/cdn-cgi/trace | grep warp | cut -d= -f2)
[[ $IPV6 = 1 ]] && LAN6=$(ip route get 2606:4700:d0::a29f:c001 2>/dev/null | grep -oP 'src \K\S+') &&
IP6=$(curl -s6m4 https://ip.gs/json) &&
WAN6=$(echo $IP6 | cut -d \" -f4) &&
COUNTRY6=$(echo $IP6 | cut -d \" -f10) &&
ASNORG6=$(echo $IP6 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' |sed "s/[,\":]//g") &&
ASNORG6=$(echo $IP6 | awk -F "asn_org" '{print $2}' | awk -F "hostname" '{print $1}' | awk -F "user_agent" '{print $1}' | sed "s/[,\":]//g") &&
TRACE6=$(curl -s6 https://www.cloudflare.com/cdn-cgi/trace | grep warp | cut -d= -f2)
[[ $LANGUAGE = 2 && $IPV4 = 1 ]] && COUNTRY4=$(curl -s "http://fanyi.youdao.com/translate?&doctype=json&type=AUTO&i=$(echo $IP4 | cut -d \" -f10)" | cut -d\" -f 18)
[[ $LANGUAGE = 2 && $IPV6 = 1 ]] && COUNTRY6=$(curl -s "http://fanyi.youdao.com/translate?&doctype=json&type=AUTO&i=$(echo $IP6 | cut -d \" -f10)" | cut -d\" -f 18)
# 判断当前 WARP 状态，决定变量 PLAN，变量 PLAN 含义：1=单栈, 2=双栈, 3=WARP已开启
[[ $TRACE4 = plus || $TRACE4 = on || $TRACE6 = plus || $TRACE6 = on ]] && PLAN=3 || PLAN=$(($IPV4+$IPV6))