~Improve UI and i18n for userguide.sh

This commit is contained in:
juewuy
2026-01-27 18:46:14 +08:00
parent 4f119380a4
commit f128560d97
3 changed files with 30 additions and 26 deletions

View File

@@ -0,0 +1,6 @@
# 推荐任务配置
TASK_RECOM_TITLE="是否启用以下推荐的自动任务配置:"
TASK_RECOM_ITEM_1="运行时每10分钟自动保存面板配置"
TASK_RECOM_ITEM_2="服务启动后自动同步 NTP 时间"
TASK_RECOM_ITEM_3="在每日的3点0分重启服务"

View File

@@ -0,0 +1,6 @@
# Recommended task configuration
TASK_RECOM_TITLE="Enable the following recommended automatic tasks?"
TASK_RECOM_ITEM_1="Save Dashboard select every 10 minutes"
TASK_RECOM_ITEM_2="Synchronize NTP after service startup"
TASK_RECOM_ITEM_3="Daily service restart at 03:00"

View File

@@ -8,6 +8,8 @@ __IS_MODULE_5_TASK_LOADED=1
. "$CRASHDIR"/libs/set_config.sh . "$CRASHDIR"/libs/set_config.sh
. "$CRASHDIR"/libs/set_cron.sh . "$CRASHDIR"/libs/set_cron.sh
load_lang 5_task
# 任务工具 # 任务工具
set_cron() { set_cron() {
[ -z "$week" ] && week=* [ -z "$week" ] && week=*
@@ -48,7 +50,7 @@ set_service() {
else else
echo "$CRASHDIR/task/task.sh $2 $3" >>"$task_file" echo "$CRASHDIR/task/task.sh $2 $3" >>"$task_file"
fi fi
content_line "任务$3】\033[32m添加成功!\033[0m" content_line "$3】\033[32m$COMMON_SUCCESS\033[0m"
sleep 1 sleep 1
} }
@@ -153,12 +155,8 @@ task_add() {
content_line "\033[36m请选择需要添加的任务\033[0m" content_line "\033[36m请选择需要添加的任务\033[0m"
separator_line "=" separator_line "="
# 输出任务列表 # 输出任务列表
# cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | awk -F '#' '{print NR") "$3}' list=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | awk -F '#' '{print $3}')
grep -Ev '^(#|$)' "$CRASHDIR/task/task.list" "$CRASHDIR/task/task.user" 2>/dev/null | list_box "$list"
awk -F '#' '{print NR") "$3}' |
while IFS= read -r line; do
content_line "$line"
done
content_line "" content_line ""
content_line "0) 返回上级菜单" content_line "0) 返回上级菜单"
separator_line "=" separator_line "="
@@ -168,7 +166,7 @@ task_add() {
break break
;; ;;
[1-9] | [1-9][0-9]) [1-9] | [1-9][0-9])
if [ "$num" -le "$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | wc -l)" ]; then if [ "$num" -le "$(echo "$list" | wc -l)" ]; then
task_id=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $1}') task_id=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $1}')
task_name=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $3}') task_name=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $3}')
task_type task_type
@@ -329,12 +327,7 @@ task_manager() {
else else
content_line "\033[33m已添加的任务\033[0m" content_line "\033[33m已添加的任务\033[0m"
separator_line "=" separator_line "="
# cat "$TMPDIR"/task_list | awk '{print NR ") " $2}' list_box "$(cat "$TMPDIR"/task_list)"
awk '{print NR ") " $2}' "$TMPDIR/task_list" |
while IFS= read -r line; do
content_line "$line"
done
separator_line "-" separator_line "-"
content_line "a) 清空旧版任务" content_line "a) 清空旧版任务"
content_line "d) 清空任务列表" content_line "d) 清空任务列表"
@@ -448,22 +441,21 @@ task_manager() {
task_recom() { task_recom() {
line_break line_break
separator_line "=" separator_line "="
content_line "\033[36m是否启用以下推荐的自动任务配置:\033[0m" content_line "\033[36m$TASK_RECOM_TITLE\033[0m"
content_line "每隔10分钟自动保存面板配置" separator_line "-"
content_line "服务启动后自动同步ntp时间" content_line "$TASK_RECOM_ITEM_1"
content_line "在每日的3点0分重启服务" content_line "$TASK_RECOM_ITEM_2"
content_line "$TASK_RECOM_ITEM_3"
separator_line "=" separator_line "="
content_line "1) 是" read -r -p "$COMMON_INPUT_R" res
content_line "0) 否,返回上级菜单"
separator_line "="
read -r -p "请输入对应标号> " res
[ "$res" = 1 ] && { [ "$res" = 1 ] && {
line_break line_break
separator_line "=" separator_line "="
set_service running "106" "运行时每10分钟自动保存面板配置" "*/10 * * * *" set_service running "106" "$TASK_RECOM_ITEM_1" "*/10 * * * *"
set_service afstart "107" "服务启动后自动同步ntp时间" set_service afstart "107" "$TASK_RECOM_ITEM_2"
cronset "在每日的3点0分重启服务" "0 3 * * * ${CRASHDIR}/task/task.sh 103 在每日的3点0分重启服务" && cronset "$TASK_RECOM_ITEM_3" "0 3 * * * ${CRASHDIR}/task/task.sh 103 $TASK_RECOM_ITEM_3" &&
content_line "任务【在每日的3点0分重启服务】\033[32m添加成功\033[0m" content_line "$TASK_RECOM_ITEM_3】\033[32m$COMMON_SUCCESS\033[0m"
separator_line "=" separator_line "="
} }
} }