moliayako/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~修复本地上传内核报错问题

Browse Source
This commit is contained in:
juewuy
2026-04-04 19:50:42 +08:00
parent 2e7d615f8a
commit 13fc116985
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/libs/i18n.sh
View File

@@ -3,6 +3,6 @@ load_lang() {
i18n=$(cat "$CRASHDIR"/configs/i18n.cfg 2>/dev/null)
[ -z "$i18n" ] && i18n=chs
file="$CRASHDIR/lang/$i18n/$1.lang"
[ -s "$file" ] && . "$file"
i18n_file="$CRASHDIR/lang/$i18n/$1.lang"
[ -s "$i18n_file" ] && . "$i18n_file"
}

19
scripts/menu.sh
View File

@@ -144,20 +144,21 @@ ckstatus() {
# 检查/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" \
local tmp_file="/tmp/$file"
comp_box "$MENU_TMP_CORE_FOUND \033[36m$tmp_file\033[0m" \
"$MENU_TMP_CORE_ASK"
btm_box "1) 立即加载" \
"0) 暂不加载"
read -r -p "$COMMON_INPUT> " res
[ "$res" = 1 ] && {
zip_type=$(echo "$file" | grep -oE 'tar.gz$|upx$|gz$')
zip_type=$(echo "$tmp_file" | grep -oE 'tar.gz$|upx$|gz$')
. "$CRASHDIR"/menus/9_upgrade.sh && setcoretype
. "$CRASHDIR"/libs/core_tools.sh && core_check "/tmp/$file"
. "$CRASHDIR"/libs/core_tools.sh && core_check "$tmp_file"
if [ "$?" = 0 ] && [ -n "$crashcore" ]; then
msg_alert "\033[32m$MENU_CORE_LOADED_OK\033[0m"
switch_core
else
rm -rf /tmp/"$file"
rm -rf "$tmp_file"
msg_alert "\033[33m$MENU_CORE_LOADED_BAD\033[0m" \
"\033[33m$MENU_CORE_REMOVED\033[0m"
fi
@@ -166,17 +167,17 @@ 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" \
local tmp_file="/tmp/$file"
comp_box "$MENU_TMP_CFG_FOUND\033[36m$tmp_file\033[0m" \
"$MENU_TMP_CFG_ASK"
btm_box "1) 立即加载" \
"0) 暂不加载"
read -p "$COMMON_INPUT> " res
[ "$res" = 1 ] && {
if [ -n "$(echo /tmp/$file | grep -iE '.json$')" ]; then
mv -f /tmp/$file "$CRASHDIR"/jsons/config.json
if [ -n "$(echo $tmp_file | grep -iE '.json$')" ]; then
mv -f "$tmp_file" "$CRASHDIR"/jsons/config.json
else
mv -f /tmp/$file "$CRASHDIR"/yamls/config.yaml
mv -f "$tmp_file" "$CRASHDIR"/yamls/config.yaml
fi
msg_alert "\033[32m$MENU_CFG_LOADED_OK\033[0m "
}