Merge branch 'master' into dev

# Conflicts:
#	ShellCrash.tar.gz
#	bin/version
#	version
This commit is contained in:
juewuy
2026-02-10 20:00:23 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -213,7 +213,8 @@ set_bot_tg_service() {
. "$CRASHDIR"/menus/bot_tg_service.sh && bot_tg_stop . "$CRASHDIR"/menus/bot_tg_service.sh && bot_tg_stop
else else
bot_tg_service=ON bot_tg_service=ON
[ -n "$(pidof CrashCore)" ] && . "$CRASHDIR"/menus/bot_tg_service.sh && bot_tg_start [ -n "$(pidof CrashCore)" ] && . "$CRASHDIR"/menus/bot_tg_service.sh &&
bot_tg_start && bot_tg_cron
fi fi
setconfig bot_tg_service "$bot_tg_service" setconfig bot_tg_service "$bot_tg_service"
} }

View File

@@ -4,7 +4,6 @@
bot_tg_start(){ bot_tg_start(){
. "$CRASHDIR"/starts/start_legacy.sh . "$CRASHDIR"/starts/start_legacy.sh
start_legacy "$CRASHDIR/menus/bot_tg.sh" 'bot_tg' start_legacy "$CRASHDIR/menus/bot_tg.sh" 'bot_tg'
bot_tg_cron
} }
bot_tg_stop(){ bot_tg_stop(){
cronload | grep -q 'TG_BOT' && cronset 'TG_BOT' cronload | grep -q 'TG_BOT' && cronset 'TG_BOT'