Merge branch 'master' into dev

# Conflicts:
#	scripts/start.sh
This commit is contained in:
juewuy
2025-12-26 10:27:06 +08:00
8 changed files with 6 additions and 9 deletions

View File

@@ -130,8 +130,7 @@ EOF
#防泄露设置
[ "$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" ] &&
[ -z "$(cat "$CRASHDIR"/jsons/*.json | grep -Ei '"tag" *: *"cn"')" ] &&
[ "$dns_mod" = "mix" ] || [ "$dns_mod" = "route" ] && ! grep -Eq '"tag" *:[[:space:]]*"cn"' "$CRASHDIR"/jsons/*.json &&
cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF
{
"route": {