From 02e48343979efe9b5601e2612439670ba542d103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?=
 <renweikg@gmail.com>
Date: Thu, 30 Mar 2023 08:17:31 +0000
Subject: [PATCH] Update CFwarp.sh

---
 CFwarp.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/CFwarp.sh b/CFwarp.sh
index fe76adf..5c0224b 100644
--- a/CFwarp.sh
+++ b/CFwarp.sh
@@ -165,7 +165,7 @@ wgcfv4=$(curl -s4m6 https://www.cloudflare.com/cdn-cgi/trace -k | grep warp | cu
 
 
 warpip(){
-checkpt(){
+checkpt2(){
 a=`cat /root/warpip/result.csv | awk -F, '$3!="timeout ms" {print} ' | sed -n '2p' | awk -F ',' '{print $2}'`
 if [[ $a = 100.00% ]]; then
 v4v6
@@ -179,6 +179,7 @@ export endpoint=`cat /root/warpip/result.csv | awk -F, '$3!="timeout ms" {print}
 fi
 green "脚本将自动应用本地VPS优选的warp对端IP地址：$endpoint"
 }
+checkpt1(){
 mkdir -p /root/warpip
 if [[ ! -f '/root/warpip/result.csv' ]]; then
 cpujg
@@ -325,21 +326,23 @@ cd /root/warpip
 ./$cpu >/dev/null 2>&1 &
 wait
 cd
-checkpt
+checkpt2
 else
+checkpt2
+fi
+}
 checkwgcf
 if [[ ! $wgcfv4 =~ on|plus && ! $wgcfv6 =~ on|plus ]]; then
-checkpt
+checkpt1
 else
 systemctl stop wg-quick@wgcf >/dev/null 2>&1
 kill -15 $(pgrep warp-go) >/dev/null 2>&1 && sleep 2
-checkpt
+checkpt1
 systemctl start wg-quick@wgcf >/dev/null 2>&1
 systemctl restart warp-go >/dev/null 2>&1
 systemctl enable warp-go >/dev/null 2>&1
 systemctl start warp-go >/dev/null 2>&1
 fi
-fi
 }
 warpip