Merge pull request #1307 from DustinWin/dev

适配 sing-box 内核规则集新特性
2026-07-24 15:47:11 +00:00 · 2026-07-20 00:06:56 +08:00 · 2026-07-18 22:47:17 +08:00 · 2026-07-18 20:36:07 +08:00
2 changed files with 4 additions and 4 deletions
--- a/scripts/menu.sh
+++ b/scripts/menu.sh
@@ -118,12 +118,12 @@ ckstatus() {

    PID=$(pidof CrashCore | awk '{print $NF}')
    if [ -n "$PID" ]; then
-        run="\033[32m$MENU_RUN_ON（$redir_mod$MENU_MOD）\033[0m"
+        run="\033[32m$MENU_RUN_ON ($redir_mod$MENU_MOD) \033[0m"
        running_status
    elif [ "$firewall_area" = 5 ] && [ -n "$(ip route list table 100)" ]; then
-        run="\033[32m$MENU_RUN_SET（$redir_mod$MENU_MOD）\033[0m"
+        run="\033[32m$MENU_RUN_SET ($redir_mod$MENU_MOD) \033[0m"
    else
-        run="\033[31m$MENU_RUN_OFF（$redir_mod$MENU_MOD）\033[0m"
+        run="\033[31m$MENU_RUN_OFF ($redir_mod$MENU_MOD) \033[0m"
        # 检测系统端口占用
        checkport
    fi
--- a/scripts/starts/singbox_modify.sh
+++ b/scripts/starts/singbox_modify.sh
@@ -169,7 +169,7 @@ gen_dns() {
    #防泄露设置
    [ "$dns_protect" = "OFF" ] && sed -i 's/"server": "dns_proxy"/"server": "dns_direct"/g' "$TMPDIR"/jsons/route.json
    #生成add_rule_set.json
-    [ "$dns_mod" = "mix" ] || [ "$dns_mod" = "route" ] && ! grep -Eq '"tag" *:[[:space:]]*"cn"' "$CRASHDIR"/jsons/*.json && {
+    [ "$dns_mod" = "mix" ] || [ "$dns_mod" = "route" ] && ! grep -Eq '"tag" *:[[:space:]]*"cn"' "$CRASHDIR"/jsons/*.json && ! grep -Eq '"tag"[[:space:]]*:[[:space:]]*\[[^]]*"cn"' "$CRASHDIR"/jsons/*.json && {
        [ "$crashcore" = "singboxr" ] && srs_path='"path": "./ruleset/cn.srs",'
        cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF
 {
Author	SHA1	Message	Date
juewuy	ff7d454432	Merge pull request #1307 from DustinWin/dev 适配 sing-box 内核规则集新特性	2026-07-20 00:06:56 +08:00
DustinWin	cc56656695	适配 sing-box 内核规则集新特性 `route.rule_set.tag` 支持了数组，修改后避免报错“cn 规则集重复”。	2026-07-18 22:47:17 +08:00
juewuy	6ed020a864	~修复中文括号	2026-07-18 20:36:07 +08:00