diff --git a/scripts/lang/chs/menu.lang b/scripts/lang/chs/menu.lang index 2d0b37d4..0ba87225 100644 --- a/scripts/lang/chs/menu.lang +++ b/scripts/lang/chs/menu.lang @@ -1,6 +1,6 @@ # ===== 通用提示 ===== -MENU_RESTART_NOTICE="检测到配置变更,是否立即重启服务以应用新配置:" +MENU_RESTART_NOTICE="检测到配置变更,是否立即重启服务以应用新配置?" MENU_PORT_CONFLICT_TITLE="检测到端口被以下进程占用!内核可能无法正常启动!" MENU_PORT_CONFLICT_HINT="请修改默认端口配置!" @@ -12,7 +12,7 @@ MENU_CORE_REMOVED="内核文件已移除,请认真检查后重新上传!" MENU_CFG_LOADED_OK="配置文件加载完成!" MENU_OVERRIDE_WARN="你已经禁用了配置文件覆写功能,这会导致大量脚本功能无法使用!" -MENU_OVERRIDE_ASK="是否取消禁用:" +MENU_OVERRIDE_ASK="是否取消禁用?" # ===== 欢迎与状态 ===== MENU_WELCOME="欢迎使用ShellCrash!" @@ -36,10 +36,10 @@ MENU_TG_CHANNEL="TG频道:" # ===== /tmp 文件检测 ===== MENU_TMP_CORE_FOUND="发现可用的内核文件:" -MENU_TMP_CORE_ASK="是否立即加载该内核(会停止当前服务):" +MENU_TMP_CORE_ASK="是否立即加载该内核(会停止当前服务)?" MENU_TMP_CFG_FOUND="发现内核配置文件:" -MENU_TMP_CFG_ASK="是否立即加载为配置文件:" +MENU_TMP_CFG_ASK="是否立即加载为配置文件?" MENU_MAIN_1="启动/重启服务" MENU_MAIN_2="功能设置" diff --git a/scripts/menu.sh b/scripts/menu.sh index e12ba2f0..ed8c6520 100644 --- a/scripts/menu.sh +++ b/scripts/menu.sh @@ -130,18 +130,6 @@ ckstatus() { # 检查执行权限 [ ! -x "$CRASHDIR"/start.sh ] && chmod +x "$CRASHDIR"/start.sh - line_break - separator_line "=" - content_line "\033[30;43m$MENU_WELCOME\033[0m" - content_line "Ver: $versionsh_l" - content_line "$MENU_TG_CHANNEL\033[36;4mhttps://t.me/ShellClash\033[0m" - separator_line "-" - content_line "$corename$run\t $auto" - if [ -n "$PID" ]; then - content_line "$MENU_MEM_USED\033[44m$VmRSS\033[0m\t $MENU_RUNNING_TIME\033[46;30m$day\033[44;37m$time\033[0m" - fi - separator_line "=" - # 检查/tmp内核文件 for file in $(ls /tmp | grep -v [/$] | grep -v ' ' | grep -Ev ".*(zip|7z|tar)$" | grep -iE 'CrashCore|^clash$|^clash-linux.*|^mihomo.*|^sing.*box'); do comp_box "$MENU_TMP_CORE_FOUND \033[36m/tmp/$file\033[0m" \ @@ -167,7 +155,7 @@ ckstatus() { # 检查/tmp配置文件 for file in $(ls /tmp | grep -v [/$] | grep -v ' ' | grep -iE 'config.yaml$|config.yml$|config.json$'); do tmp_file=/tmp/$file - comp_box "$MENU_TMP_CFG_FOUND \033[36m/tmp/$file\033[0m" \ + comp_box "$MENU_TMP_CFG_FOUND\033[36m/tmp/$file\033[0m" \ "$MENU_TMP_CFG_ASK" btm_box "1) 立即加载" \ "0) 暂不加载" @@ -191,6 +179,16 @@ ckstatus() { read -p "$COMMON_INPUT> " res [ "$res" = 1 ] && unset disoverride && setconfig disoverride } + + top_box "\033[30;43m$MENU_WELCOME\033[0m" \ + "Ver: $versionsh_l" \ + "$MENU_TG_CHANNEL\033[36;4mhttps://t.me/ShellClash\033[0m" + separator_line "-" + content_line "$corename$run\t $auto" + if [ -n "$PID" ]; then + content_line "$MENU_MEM_USED\033[44m$VmRSS\033[0m\t $MENU_RUNNING_TIME\033[46;30m$day\033[44;37m$time\033[0m" + fi + separator_line "=" } main_menu() {