From a4e71e01274d155267983a6b7d4a04f5cb8100ba 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?=
 <121604513+yonggekkk@users.noreply.github.com>
Date: Sat, 1 Mar 2025 08:13:53 +0800
Subject: [PATCH] Update serv00.sh

---
 serv00.sh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/serv00.sh b/serv00.sh
index 97ff029..db3f9ee 100644
--- a/serv00.sh
+++ b/serv00.sh
@@ -1308,16 +1308,16 @@ if [[ -e $WORKDIR/config.json ]]; then
 
 nochinawarp(){
 if [[ -e $WORKDIR/config.json ]]; then
-gosite=$(jq -r '.route.rules[].rule_set[]?' $WORKDIR/config.json)
-[[ "$gosite" == *"geolocation-!cn"* ]] && echo 已开启非中国全局WARP代理 ||  echo 未开启非中国全局WARP代理
-yellow "1、开启非中国全局WARP代理 (访问国外网站都用WARP的IP)"
-yellow "2、关闭非中国全局WARP代理 (恢复默认)"
-yellow "3、返回上层"
-reading "【请选择 1 或者 2】: " gowarp
+gosite=$(jq -r '.route.final' $WORKDIR/config.json)
+[[ "$gosite" == wg ]] && purple "当前已开启全局WARP代理" || purple "当前未开启全局WARP代理"
+yellow "1、开启全局WARP代理"
+yellow "2、关闭全局WARP代理"
+yellow "0、返回上层"
+reading "【请选择0-2】: " gowarp
 if [[ "$gowarp" == 1 ]]; then
-jq -r '(.route.rules[] | select(.rule_set != null) | .rule_set[]) |= sub("cnn"; "geolocation-!cn")' "$WORKDIR/config.json" > "$WORKDIR/temp.json" && mv "$WORKDIR/temp.json" "$WORKDIR/config.json"
+sed -i'' 's/\"final\": \"direct\"/\"final\": \"wg\"/g' "$WORKDIR"/config.json
 elif [[ "$gowarp" == 2 ]]; then
-jq -r '(.route.rules[] | select(.rule_set != null) | .rule_set[]) |= sub("geolocation-!cn"; "cnn")' "$WORKDIR/config.json" > "$WORKDIR/temp.json" && mv "$WORKDIR/temp.json" "$WORKDIR/config.json"
+sed -i'' 's/\"final\": \"wg\"/\"final\": \"direct\"/g' "$WORKDIR"/config.json
 else
 sb
 fi
@@ -1326,6 +1326,11 @@ red "未安装脚本，请选择1进行安装" && exit
 fi
 }
 
+changekeep(){
+gosite=$(jq -r '.route.final' $WORKDIR/config.json)
+
+}
+
 resservsb(){
 if [[ -e $WORKDIR/config.json ]]; then
 yellow "重启中……请稍后……"
@@ -1364,7 +1369,7 @@ menu() {
    echo   "------------------------------------------------------------"
    green  "4. 更新脚本"
    echo   "------------------------------------------------------------"
-   green  "5. 开启非中国全局WARP代理"
+   green  "5. 开启全局WARP代理"
    echo   "------------------------------------------------------------"
    green  "6. 查看各节点分享/sing-box与clash订阅链接/反代IP/ProxyIP"
    echo   "------------------------------------------------------------"