xiaochou164
/
CFwarp
mirror of https://gitlab.com/rwkgyg/CFwarp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update 661.sh

This commit is contained in:
甬哥侃侃侃ygkkk 2023-03-01 04:11:32 +00:00
parent 483c64ec92
commit fda5bb4f16
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
661.sh
View File

@ -1403,16 +1403,12 @@ changewarp(){
WARPun && ONEWARPGO WARPun && ONEWARPGO
} }
ShowSOCKS5(){ ShowSOCKS5(){
if [[ $(systemctl is-active warp-svc) = active ]]; then if [[ $(systemctl is-active warp-svc) = active ]]; then
mport=`warp-cli --accept-tos settings 2>/dev/null | grep 'WarpProxy on port' | awk -F "port " '{print $2}'` mport=`warp-cli --accept-tos settings 2>/dev/null | grep 'WarpProxy on port' | awk -F "port " '{print $2}'`
s5ip=`curl -sx socks5h://localhost:$mport ip.gs -k` s5ip=`curl -sx socks5h://localhost:$mport ip.gs -k`
#./nf -proxy socks5://127.0.0.1:$mport NF=$(./nf -proxy socks5h://localhost:$mport | awk '{print $1}' | sed -n '3p')
[[ $(curl -sx socks5h://localhost:$mport https://chat.openai.com/ -I | grep "text/plain") != "" ]] && chat='遗憾，无法访问Chatgpt官网服务' || chat='恭喜，支持访问Chatgpt官网服务' [[ $(curl -sx socks5h://localhost:$mport https://chat.openai.com/ -I | grep "text/plain") != "" ]] && chat='遗憾，无法访问Chatgpt官网服务' || chat='恭喜，支持访问Chatgpt官网服务'
isp4a=`curl -sx socks5h://localhost:$mport --user-agent "${UA_Browser}" http://ip-api.com/json/$v4?lang=zh-CN -k | cut -f13 -d ":" | cut -f2 -d '"'` isp4a=`curl -sx socks5h://localhost:$mport --user-agent "${UA_Browser}" http://ip-api.com/json/$v4?lang=zh-CN -k | cut -f13 -d ":" | cut -f2 -d '"'`
isp4b=`curl -sx socks5h://localhost:$mport --user-agent "${UA_Browser}" https://api.ip.sb/geoip/$v4 -k | awk -F "isp" '{print $2}' | awk -F "offset" '{print $1}' | sed "s/[,\":]//g"` isp4b=`curl -sx socks5h://localhost:$mport --user-agent "${UA_Browser}" https://api.ip.sb/geoip/$v4 -k | awk -F "isp" '{print $2}' | awk -F "offset" '{print $1}' | sed "s/[,\":]//g"`
[[ -n $isp4a ]] && isp4=$isp4a || isp4=$isp4b [[ -n $isp4a ]] && isp4=$isp4a || isp4=$isp4b
@ -1426,15 +1422,12 @@ country=$nonf
else else
country=$snnf country=$snnf
fi fi
socks5=$(curl -sx socks5h://localhost:$mport www.cloudflare.com/cdn-cgi/trace -k --connect-timeout 2 | grep warp | cut -d= -f2) socks5=$(curl -sx socks5h://localhost:$mport www.cloudflare.com/cdn-cgi/trace -k --connect-timeout 2 | grep warp | cut -d= -f2)
case ${socks5} in case ${socks5} in
plus) plus)
S5Status=$(white "Socks5 WARP+状态：\c" ; rred "运行中，WARP+普通账户(剩余WARP+流量:$((`warp-cli --accept-tos account | grep Quota | awk '{ print $(NF) }'`/1000000000))GiB)" ; white " Socks5 端口：\c" ; rred "$mport" ; white " [ Cloudflare服务商 ]获取IPV4：\c" ; rred "$s5ip" ; white " IPV4 奈飞NF解锁情况：\c" ; rred "$NF \c" ; white " IPV4 所在地区：\c" ; rred "$country");; S5Status=$(white "Socks5 WARP+状态：\c" ; rred "运行中，WARP+普通账户(剩余WARP+流量:$((`warp-cli --accept-tos account | grep Quota | awk '{ print $(NF) }'`/1000000000))GiB)" ; white " Socks5 端口：\c" ; rred "$mport" ; white " 服务商 Cloudflare 获取IPV4地址：\c" ; rred "$s5ip $country" ; white " 奈飞NF解锁情况：\c" ; rred "$NF \c" ; white " Chatgpt支持情况：\c" ; rred "$chat");;
on) on)
S5Status=$(white "Socks5 WARP状态：\c" ; green "运行中，WARP普通账户(无限WARP流量)" ; white " Socks5 端口：\c" ; green "$mport" ; white " [ Cloudflare服务商 ]获取IPV4：\c" ; green "$s5ip" ; white " IPV4 奈飞NF解锁情况：\c" ; green "$NF \c"; white " IPV4 所在地区：\c" ; green "$country");; S5Status=$(white "Socks5 WARP状态：\c" ; green "运行中，WARP普通账户(无限WARP流量)" ; white " Socks5 端口：\c" ; green "$mport" ; white " 服务商 Cloudflare 获取IPV4地址：\c" ; green "$s5ip $country" ; white " 奈飞NF解锁情况：\c" ; green "$NF \c" ; white " Chatgpt支持情况：\c" ; green "$chat");;
*) *)
S5Status=$(white "Socks5 WARP状态：\c" ; yellow "已安装Socks5-WARP客户端，但端口处于关闭状态") S5Status=$(white "Socks5 WARP状态：\c" ; yellow "已安装Socks5-WARP客户端，但端口处于关闭状态")
esac esac
@ -1443,7 +1436,6 @@ S5Status=$(white "Socks5 WARP状态：\c" ; red "未安装Socks5-WARP客户端")
fi fi
} }
SOCKS5ins(){ SOCKS5ins(){
yellow "检测Socks5-WARP安装环境中……" yellow "检测Socks5-WARP安装环境中……"
if [[ $release = Centos ]]; then if [[ $release = Centos ]]; then
@ -1505,11 +1497,6 @@ S5menu
} }
start_menu(){ start_menu(){
ShowWGCF;ShowSOCKS5 ShowWGCF;ShowSOCKS5
clear clear