xm/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2026-07-24 15:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: xm:master
Branches Tags
xm:dev xm:update xm:master xm:stable xm:rm
xm:1.9.4 xm:1.9.4rc6.1 xm:1.9.4rc4.1 xm:1.9.4rc2 xm:1.9.5alpha6.4 xm:1.9.5alpha6.2 xm:1.9.4beta3.2 xm:1.9.3 xm:1.9.1 xm:1.9.0 xm:1.8.0 xm:clash.premium.latest xm:1.7.0 xm:1.6.3 xm:1.6.1 xm:1.5.1 xm:1.4.3 xm:1.4.1 xm:1.3.0 xm:1.2.0 xm:1.1.0 xm:0.9.7 xm:0.9.5 xm:0.9.4 xm:0.9.0 xm:0.5 xm:0.2 xm:0.1
...
compare: xm:ff7d4544326c4cf3469ed9cc40ad18d01acef5ac
Branches Tags
xm:update xm:dev xm:master xm:stable xm:rm
xm:1.9.4 xm:1.9.4rc6.1 xm:1.9.4rc4.1 xm:1.9.4rc2 xm:1.9.5alpha6.4 xm:1.9.5alpha6.2 xm:1.9.4beta3.2 xm:1.9.3 xm:1.9.1 xm:1.9.0 xm:1.8.0 xm:clash.premium.latest xm:1.7.0 xm:1.6.3 xm:1.6.1 xm:1.5.1 xm:1.4.3 xm:1.4.1 xm:1.3.0 xm:1.2.0 xm:1.1.0 xm:0.9.7 xm:0.9.5 xm:0.9.4 xm:0.9.0 xm:0.5 xm:0.2 xm:0.1

3 Commits
master ... ff7d454432

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
2 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

6
scripts/menu.sh
View File

@@ -118,12 +118,12 @@ ckstatus() {
PID=$(pidof CrashCore | awk '{print $NF}') PID=$(pidof CrashCore | awk '{print $NF}')
if [ -n "$PID" ]; then 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 running_status
elif [ "$firewall_area" = 5 ] && [ -n "$(ip route list table 100)" ]; then 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 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 checkport
fi fi

2
scripts/starts/singbox_modify.sh
View File

@@ -169,7 +169,7 @@ gen_dns() {
#防泄露设置 #防泄露设置
[ "$dns_protect" = "OFF" ] && sed -i 's/"server": "dns_proxy"/"server": "dns_direct"/g' "$TMPDIR"/jsons/route.json [ "$dns_protect" = "OFF" ] && sed -i 's/"server": "dns_proxy"/"server": "dns_direct"/g' "$TMPDIR"/jsons/route.json
#生成add_rule_set.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",' [ "$crashcore" = "singboxr" ] && srs_path='"path": "./ruleset/cn.srs",'
cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF
{ {