4 Commits

Author SHA1 Message Date
juewuy
cc563dcfa1 Merge branch 'dev'
# Conflicts:
#	ShellCrash.tar.gz
#	bin/version
#	scripts/starts/start_legacy_wd.sh
#	version
2026-07-18 20:28:21 +08:00
juewuy
2a084019e2 Merge pull request #1240 from abcfy2/master
使用兼容性更强的 `rm -fr` 代替 `rm -d` 删除锁目录
2026-03-22 05:06:02 -07:00
Feng Yu
7f22bb550a 使用兼容性更强的 rm -fr 代替 rm -d 删除锁目录
Fix #1238
2026-03-22 19:32:07 +08:00
juewuy
0b7f7161b0 ~1.9.4release 2026-02-15 19:19:19 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -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

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
#生成add_rule_set.json
[ "$dns_mod" = "mix" ] || [ "$dns_mod" = "route" ] && ! grep -Eq '"tag" *:[[:space:]]*"cn"' "$CRASHDIR"/jsons/*.json && ! grep -Eq '"tag"[[:space:]]*:[[:space:]]*\[[^]]*"cn"' "$CRASHDIR"/jsons/*.json && {
[ "$dns_mod" = "mix" ] || [ "$dns_mod" = "route" ] && ! grep -Eq '"tag" *:[[:space:]]*"cn"' "$CRASHDIR"/jsons/*.json && {
[ "$crashcore" = "singboxr" ] && srs_path='"path": "./ruleset/cn.srs",'
cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF
{