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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
juewuy
2026-10-24 18:23:26 +08:00
parent 529d16fa75 f73b1c810a
commit 87d2be57a4
16 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/menus/4_setboot.sh
+5 -5
View File
@@ -131,7 +131,7 @@ setboot() {
msg_alert "\033[33m$SETBOOT_MINI_DISABLED\033[0m"
fi
fi
sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/command.env
sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/directories.env
sleep 1
;;
5)
@@ -155,8 +155,8 @@ setboot() {
set_usb_dir() {
while true; do
comp_box "$SETBOOT_SELECT_INSTALL_DIR"
du -hL /mnt |
awk '{print NR") "$2" ($SETBOOT_SPACE_USED$1")"}' |
du -hL -d 2 /mnt |
awk '{print NR") "$2" ($SETBOOT_SPACE_USED"$1"）"}' |
while IFS= read -r line; do
content_line "$line"
done
@@ -164,7 +164,7 @@ setboot() {
content_line "0) $COMMON_BACK"
separator_line "="
read -r -p "$COMMON_INPUT> " num
BINDIR=$(du -hL /mnt | awk '{print $2}' | sed -n "$num"p)
BINDIR=$(du -hL -d 2 /mnt | awk '{print $2}' | sed -n "$num"p)
if [ "$num" = 0 ]; then
return 1
elif [ -z "$BINDIR" ]; then
@@ -203,7 +203,7 @@ setboot() {
continue
;;
esac
sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/command.env
sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/directories.env
break
done
;;
scripts/menus/5_task.sh
+2 -2
View File
@@ -229,8 +229,8 @@ task_type() {
[ -n "$cron_time" ] && set_service running "$task_id" "$TASK5_RUNNING_PREFIX$time_des$task_name" "$cron_time"
;;
8)
comp_box "$TASK5_AFFW_HINT"
"$TASK5_CONFIRM_CONTINUE"
comp_box "$TASK5_AFFW_HINT" \
"$TASK5_CONFIRM_CONTINUE"
btm_box "1) $TASK5_YES" \
"0) $TASK5_NO"
read -r -p "$COMMON_INPUT> " res
scripts/menus/running_status.sh
+1 -1
View File
@@ -7,7 +7,7 @@ running_status(){
if [ -n "$start_time" ]; then
time=$(($(date +%s) - start_time))
day=$((time / 86400))
[ "$day" = "0" ] && day='' || day="$dayD"
[ "$day" = "0" ] && day='' || day="${day}D"
time=$(date -u -d @${time} +%H:%M:%S)
fi
}
scripts/menus/task_cmd.sh
+1 -1
View File
@@ -135,7 +135,7 @@ hotupdate() { #热更新订阅
. "$CRASHDIR"/starts/core_config.sh && get_core_config &&
. "$CRASHDIR"/starts/check_core.sh && check_core &&
. "$CRASHDIR"/starts/"$target"_modify.sh && modify_"$format" && rm -rf "$TMPDIR"/CrashCore &&
. "$CRASHDIR"/libs/web_restore.sh && put_save "http://127.0.0.1:$db_port/configs" "{\"path\":\"$TMPDIR/config.$format\"}"
. "$CRASHDIR"/libs/web_restore.sh && put_save "http://127.0.0.1:$db_port/configs" "{\"path\":\"$CRASHDIR/config.$format\"}"
exit $?
}
scripts/menus/userguide.sh
+1 -1
View File
@@ -124,7 +124,7 @@ userguide() {
read -r -p "$COMMON_INPUT_R" res
[ "$res" = 1 ] && {
BINDIR=/tmp/ShellCrash
sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/command.env
sed -i "s#BINDIR=.*#BINDIR=$BINDIR#" "$CRASHDIR"/configs/directories.env
}
fi