From a381eb32190659f2b9a7168c9c54d66f4d26ddbf 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: Sat, 6 May 2023 00:34:18 +0000
Subject: [PATCH] Update CFwarp.sh

---
 CFwarp.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CFwarp.sh b/CFwarp.sh
index 7fa682f..79197df 100644
--- a/CFwarp.sh
+++ b/CFwarp.sh
@@ -519,6 +519,7 @@ apt purge cloudflare-warp -y
 rm -f /etc/apt/sources.list.d/cloudflare-client.list /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg
 fi
 $yumapt autoremove
+rm -rf /root/warpip
 }
 
 lncf(){
@@ -783,7 +784,7 @@ fi
 done
 if [[ ! $wgcfv4 =~ on|plus && ! $wgcfv6 =~ on|plus ]]; then
 red "安装WARP失败，还原VPS，卸载WARP"
-cwg && rm -rf /root/warpip
+cwg
 echo
 [[ $release = Centos && ${vsid} -lt 7 ]] && yellow "当前系统版本号：Centos $vsid \n建议使用 Centos 7 以上系统 " 
 [[ $release = Ubuntu && ${vsid} -lt 18 ]] && yellow "当前系统版本号：Ubuntu $vsid \n建议使用 Ubuntu 18 以上系统 " 
@@ -1162,6 +1163,7 @@ kill -15 $(pgrep warp-go) >/dev/null 2>&1
 chattr -i /etc/resolv.conf >/dev/null 2>&1
 sed -i '/^precedence ::ffff:0:0\/96  100/d;/^label 2002::\/16   2/d' /etc/gai.conf 2>/dev/null
 rm -rf /usr/local/bin/warp-go /usr/local/bin/warpplus.log /usr/local/bin/warp.conf /usr/local/bin/wgwarp.conf /usr/local/bin/sbwarp.json /usr/bin/warp-go /lib/systemd/system/warp-go.service /root/WARP-UP.sh
+rm -rf /root/warpip
 }
 WARPun(){
 ab="1.仅卸载warp\n2.仅卸载socks5-warp\n3.彻底卸载warp（1+2）\n 请选择："
@@ -1169,7 +1171,7 @@ readp "$ab" cd
 case "$cd" in
 1 ) cwg && green "warp卸载完成" && ShowWGCF && WGCFmenu;;
 2 ) cso && green "socks5-warp卸载完成" && ShowSOCKS5 && S5menu;;
-3 ) cwg && rm -rf /root/warpip && cso && unreswarp && green "warp与socks5-warp都已卸载完成" && ShowWGCF;ShowSOCKS5;IP_Status_menu;;
+3 ) cwg && cso && unreswarp && green "warp与socks5-warp都已卸载完成" && ShowWGCF;ShowSOCKS5;IP_Status_menu;;
 esac
 }
 
@@ -1555,7 +1557,7 @@ done
 checkwgcf
 if [[ ! $wgcfv4 =~ on|plus && ! $wgcfv6 =~ on|plus ]]; then
 red "安装WARP失败，还原VPS，卸载Wgcf-WARP组件中……"
-cwg && rm -rf /root/warpip
+cwg
 echo
 [[ $release = Centos && ${vsid} -lt 7 ]] && yellow "当前系统版本号：Centos $vsid \n建议使用 Centos 7 以上系统 " 
 [[ $release = Ubuntu && ${vsid} -lt 18 ]] && yellow "当前系统版本号：Ubuntu $vsid \n建议使用 Ubuntu 18 以上系统 " 
@@ -1702,6 +1704,7 @@ $yumapt autoremove
 dig9
 sed -i '/^precedence ::ffff:0:0\/96  100/d;/^label 2002::\/16   2/d' /etc/gai.conf 2>/dev/null
 rm -rf /usr/local/bin/wgcf /usr/bin/wg-quick /etc/wireguard/wgcf.conf /etc/wireguard/wgcf-profile.conf /etc/wireguard/buckup-account.toml /etc/wireguard/wgcf-account.toml /etc/wireguard/wgcf+p.log /etc/wireguard/ID /usr/bin/wireguard-go /usr/bin/wgcf wgcf-account.toml wgcf-profile.conf /root/WARP-UP.sh
+rm -rf /root/warpip
 }
 
 WARPun(){
@@ -1710,7 +1713,7 @@ readp "$ab" cd
 case "$cd" in
 1 ) cwg && green "warp卸载完成" && ShowWGCF && WGCFmenu;;
 2 ) cso && green "socks5-warp卸载完成" && ShowSOCKS5 && S5menu;;
-3 ) cwg && rm -rf /root/warpip && cso && unreswarp && green "warp与socks5-warp都已卸载完成" && ShowWGCF;ShowSOCKS5;IP_Status_menu;;
+3 ) cwg && cso && unreswarp && green "warp与socks5-warp都已卸载完成" && ShowWGCF;ShowSOCKS5;IP_Status_menu;;
 esac
 }