4 Commits

Author SHA1 Message Date
juewuy
31bf9915c6 ~修复小闪存模式部分情况下启动报错的bug 2026-02-15 20:37:11 +08:00
juewuy
cae9613225 Merge branch 'master' into dev 2026-02-14 21:15:57 +08:00
juewuy
02a342cbd1 Merge branch 'master' of https://github.com/juewuy/ShellCrash into master
# Conflicts:
#	scripts/starts/start_legacy_wd.sh
2026-02-14 21:15:43 +08:00
juewuy
1fbade025a ~优化保守模式守护进程 2026-02-14 21:14:13 +08:00
4 changed files with 6 additions and 9 deletions

View File

@@ -81,11 +81,8 @@ done
setconfig versionsh_l $version setconfig versionsh_l $version
#生成用于执行启动服务的变量文件 #生成用于执行启动服务的变量文件
[ ! -f "$CRASHDIR"/configs/command.env ] && { [ ! -f "$CRASHDIR"/configs/command.env ] && {
TMPDIR='/tmp/ShellCrash' echo 'TMPDIR=/tmp/ShellCrash' > "$CRASHDIR"/configs/command.env
BINDIR="$CRASHDIR" echo "BINDIR=$CRASHDIR" >> "$CRASHDIR"/configs/command.env
touch "$CRASHDIR"/configs/command.env
setconfig TMPDIR "$TMPDIR" "$CRASHDIR"/configs/command.env
setconfig BINDIR "$BINDIR" "$CRASHDIR"/configs/command.env
} }
if [ -n "$(grep 'crashcore=singbox' "$CFG_PATH")" ]; then if [ -n "$(grep 'crashcore=singbox' "$CFG_PATH")" ]; then
COMMAND='"$TMPDIR/CrashCore run -D $BINDIR -C $TMPDIR/jsons"' COMMAND='"$TMPDIR/CrashCore run -D $BINDIR -C $TMPDIR/jsons"'

View File

@@ -129,7 +129,7 @@ setboot() {
msg_alert "\033[33m已经停用小闪存功能\033[0m" msg_alert "\033[33m已经停用小闪存功能\033[0m"
fi fi
fi fi
setconfig BINDIR "$BINDIR" "$CRASHDIR"/configs/command.env sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/command.env
sleep 1 sleep 1
;; ;;
5) 5)
@@ -201,7 +201,7 @@ setboot() {
continue continue
;; ;;
esac esac
setconfig BINDIR "$BINDIR" "$CRASHDIR"/configs/command.env sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/command.env
break break
done done
;; ;;

View File

@@ -99,7 +99,7 @@ userguide() {
read -r -p "$COMMON_INPUT_R" res read -r -p "$COMMON_INPUT_R" res
[ "$res" = 1 ] && { [ "$res" = 1 ] && {
BINDIR=/tmp/ShellCrash BINDIR=/tmp/ShellCrash
setconfig BINDIR /tmp/ShellCrash "$CRASHDIR"/configs/command.env sed -i "s#BINDIR=.*#BINDIR=$BINDIR" "$CRASHDIR"/configs/command.env
} }
fi fi

View File

@@ -11,7 +11,7 @@ if [ -f "$PIDFILE" ]; then
if [ -n "$PID" ] && [ "$PID" -eq "$PID" ] 2>/dev/null; then if [ -n "$PID" ] && [ "$PID" -eq "$PID" ] 2>/dev/null; then
if kill -0 "$PID" 2>/dev/null || [ -d "/proc/$PID" ]; then if kill -0 "$PID" 2>/dev/null || [ -d "/proc/$PID" ]; then
rm -d "$LOCKDIR" 2>/dev/null rm -d "$LOCKDIR" 2>/dev/null
return 0 exit 0
fi fi
else else
rm -f "$PIDFILE" rm -f "$PIDFILE"