diff --git a/old/t.sh b/old/t.sh index 1c460da..da348c1 100644 --- a/old/t.sh +++ b/old/t.sh @@ -36,12 +36,12 @@ green " 检查环境中…… " [[ $IPV4 = 1 ]] && LAN4=$(ip route get 162.159.192.1 2>/dev/null | grep -oP 'src \K\S+') && WAN4=$(wget --no-check-certificate -qO- -4 ip.gs) && COUNTRY4=$(wget --no-check-certificate -qO- -4 https://ip.gs/country) && - TRACE4=[[ $(wget --no-check-certificate -qO- -4 https://www.cloudflare.com/cdn-cgi/trace | grep warp | cut -d= -f2) ]] + TRACE4=$(wget --no-check-certificate -qO- -4 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+') && WAN6=$(wget --no-check-certificate -qO- -6 ip.gs) && COUNTRY6=$(wget --no-check-certificate -qO- -6 https://ip.gs/country) && - TRACE6=[[ $(wget --no-check-certificate -qO- -6 https://www.cloudflare.com/cdn-cgi/trace | grep warp | cut -d= -f2) ]] + TRACE6=$(wget --no-check-certificate -qO- -6 https://www.cloudflare.com/cdn-cgi/trace | grep warp | cut -d= -f2) # 判断当前 WARP 状态,决定变量 PLAN,变量 PLAN 含义:01=IPv6, 10=IPv4, 11=IPv4+IPv6, 2=WARP已开启 [[ $TRACE4 != off || $TRACE6 != off ]] && PLAN=2 || PLAN=$IPV4$IPV6 @@ -184,10 +184,9 @@ install(){ WAN6=$(wget --no-check-certificate -T1 -t1 -qO- -6 ip.gs) done COUNTRY4=$(wget --no-check-certificate -qO- -4 https://ip.gs/country) - [[ $(wget --no-check-certificate -qO- -4 https://www.cloudflare.com/cdn-cgi/trace | egrep "warp=plus|warp=on") ]] && WARP4=1 + TRACE4=$(wget --no-check-certificate -qO- -4 https://www.cloudflare.com/cdn-cgi/trace | grep warp | cut -d= -f2) COUNTRY6=$(wget --no-check-certificate -qO- -6 https://ip.gs/country) - [[ $(wget --no-check-certificate -qO- -6 https://www.cloudflare.com/cdn-cgi/trace | egrep "warp=plus|warp=on") ]] && WARP6=1 - + TRACE6=$(wget --no-check-certificate -qO- -6 https://www.cloudflare.com/cdn-cgi/trace | grep warp | cut -d= -f2) # 设置开机启动,由于warp bug,有时候获取不了ip地址,在定时任务加了重启后自动刷网络 systemctl enable wg-quick@wgcf >/dev/null 2>&1 grep -qE '^@reboot[ ]*root[ ]*bash[ ]*/etc/wireguard/WARP_AutoUp.sh' /etc/crontab || echo '@reboot root bash /etc/wireguard/WARP_AutoUp.sh' >> /etc/crontab