diff --git a/661.sh b/661.sh index e509789..a9c8318 100644 --- a/661.sh +++ b/661.sh @@ -1,7 +1,7 @@ #!/bin/bash export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export LANG=en_US.UTF-8 -wpygV="23.3.7 V 0.8 " +wpygV="23.3.11 V 0.9 " remoteV=`wget -qO- https://gitlab.com/rwkgyg/CFwarp/raw/main/CFwarp.sh | sed -n 4p | cut -d '"' -f 2` chmod +x /root/CFwarp.sh red='\033[0;31m' @@ -150,6 +150,7 @@ systemctl start warp-go >/dev/null 2>&1 fi } + mtuwarp(){ v4v6 yellow "开始自动设置warp的MTU最佳网络吞吐量值,以优化WARP网络!" @@ -426,18 +427,14 @@ WARPIPv6Status=$(white "IPV6状态:\c" ; red "不存在IPV6地址 ") fi } - -wgconf(){ -point wgo1='sed -i "s#.*AllowedIPs.*#AllowedIPs = 0.0.0.0/0#g" /usr/local/bin/warp.conf' wgo2='sed -i "s#.*AllowedIPs.*#AllowedIPs = ::/0#g" /usr/local/bin/warp.conf' wgo3='sed -i "s#.*AllowedIPs.*#AllowedIPs = 0.0.0.0/0,::/0#g" /usr/local/bin/warp.conf' -wgo4=$(sed -i "/Endpoint6/d" /usr/local/bin/warp.conf && sed -i "s/162.159.*/$endpoint/g" /usr/local/bin/warp.conf) +wgo4='sed -i "/Endpoint6/d" /usr/local/bin/warp.conf && sed -i "s/162.159.*/162.159.193.10:1701/g" /usr/local/bin/warp.conf' wgo5='sed -i "/Endpoint6/d" /usr/local/bin/warp.conf && sed -i "s/162.159.*/[2606:4700:d0::a29f:c003]:1701/g" /usr/local/bin/warp.conf' wgo6='sed -i "20 s/^/PostUp = ip -4 rule add from $(ip route get 162.159.192.1 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf && sed -i "20 s/^/PostDown = ip -4 rule delete from $(ip route get 162.159.192.1 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf' wgo7='sed -i "20 s/^/PostUp = ip -6 rule add from $(ip route get 2606:4700:d0::a29f:c001 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf && sed -i "20 s/^/PostDown = ip -6 rule delete from $(ip route get 2606:4700:d0::a29f:c001 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf' wgo8='sed -i "20 s/^/PostUp = ip -4 rule add from $(ip route get 162.159.192.1 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf && sed -i "20 s/^/PostDown = ip -4 rule delete from $(ip route get 162.159.192.1 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf && sed -i "20 s/^/PostUp = ip -6 rule add from $(ip route get 2606:4700:d0::a29f:c001 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf && sed -i "20 s/^/PostDown = ip -6 rule delete from $(ip route get 2606:4700:d0::a29f:c001 | grep -oP "src \K\S+") lookup main\n/" /usr/local/bin/warp.conf' -} CheckWARP(){ i=0 @@ -527,8 +524,6 @@ nat4(){ } WGCFv4(){ -wgconf -echo $endpoint yellow "稍等3秒,检测VPS内warp环境" docker && checkwgcf if [[ ! $wgcfv4 =~ on|plus && ! $wgcfv6 =~ on|plus ]]; then @@ -566,8 +561,6 @@ fi } WGCFv6(){ -wgconf -echo $endpoint yellow "稍等3秒,检测VPS内warp环境" docker && checkwgcf if [[ ! $wgcfv4 =~ on|plus && ! $wgcfv6 =~ on|plus ]]; then @@ -604,8 +597,6 @@ fi } WGCFv4v6(){ -wgconf -echo $endpoint yellow "稍等3秒,检测VPS内warp环境" docker && checkwgcf if [[ ! $wgcfv4 =~ on|plus && ! $wgcfv6 =~ on|plus ]]; then @@ -698,6 +689,13 @@ Restart=always WantedBy=multi-user.target EOF ABC +point +echo $endpoint +po1=`grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+' /usr/local/bin/warp.conf` +echo $po1 + +sed -i "s/$po1/$endpoint/g" /usr/local/bin/warp.conf + systemctl daemon-reload systemctl enable warp-go systemctl start warp-go @@ -951,7 +949,7 @@ green "当前Wireguard节点二维码分享链接如下" && sleep 1 qrencode -t ansiutf8 < /usr/local/bin/wgwarp.conf echo #green "当前Sing-box出站配置文件如下" && sleep 1 -#yellow "$(cat /usr/local/bin/sbwarp.json | python3 -m json.tool)" +#yellow "$(cat /usr/local/bin/sbwarp.json | python3 -mjson.tool)" } start_menu(){