mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-10 23:41:22 +00:00
Merge branch 'master' into dev
# Conflicts: # ShellCrash.tar.gz # bin/version # version
This commit is contained in:
Binary file not shown.
@@ -1,4 +1,4 @@
|
|||||||
meta_v=v1.19.17
|
meta_v=v1.19.17
|
||||||
singboxr_v=1.13.0-alpha.27
|
singboxr_v=1.13.0-alpha.27
|
||||||
versionsh=1.9.5alpha8.1
|
versionsh=1.9.5alpha8.O2
|
||||||
GeoIP_v=20251205
|
GeoIP_v=20251205
|
||||||
|
|||||||
@@ -37,8 +37,9 @@ if [ -n "$test" -o -n "$(pidof CrashCore)" ]; then
|
|||||||
#加载定时任务
|
#加载定时任务
|
||||||
[ -s "$CRASHDIR"/task/cron ] && cronadd "$CRASHDIR"/task/cron
|
[ -s "$CRASHDIR"/task/cron ] && cronadd "$CRASHDIR"/task/cron
|
||||||
[ -s "$CRASHDIR"/task/running ] && {
|
[ -s "$CRASHDIR"/task/running ] && {
|
||||||
cronset '运行时每'
|
cronload | grep -v '^$' | grep -vF "运行时每" >/tmp/cron_tmp
|
||||||
cronadd "$CRASHDIR"/task/running
|
cat "$CRASHDIR"/task/running >> /tmp/cron_tmp
|
||||||
|
cronadd /tmp/cron_tmp
|
||||||
}
|
}
|
||||||
[ "$start_old" = "ON" ] && cronset '保守模式守护进程' "* * * * * /bin/sh $CRASHDIR/starts/start_legacy_wd.sh shellcrash #ShellCrash保守模式守护进程"
|
[ "$start_old" = "ON" ] && cronset '保守模式守护进程' "* * * * * /bin/sh $CRASHDIR/starts/start_legacy_wd.sh shellcrash #ShellCrash保守模式守护进程"
|
||||||
#加载条件任务
|
#加载条件任务
|
||||||
|
|||||||
Reference in New Issue
Block a user