diff --git a/scripts/libs/core_tools.sh b/scripts/libs/core_tools.sh index 39f54253..4bd1decb 100644 --- a/scripts/libs/core_tools.sh +++ b/scripts/libs/core_tools.sh @@ -72,8 +72,11 @@ core_webget(){ [ -z "$zip_type" ] && zip_type='tar.gz' get_bin "$TMPDIR/Coretmp.$zip_type" "bin/$crashcore/${target}-linux-${cpucore}.$zip_type" else - zip_type=$(echo "$custcorelink" | grep -oE 'tar.gz$') - [ -z "$zip_type" ] && zip_type=$(echo "$custcorelink" | grep -oE 'gz$') + case "$custcorelink" in + *.tar.gz) zip_type="tar.gz" ;; + *.gz) zip_type="gz" ;; + *.upx) zip_type="upx" ;; + esac [ -n "$zip_type" ] && webget "$TMPDIR/Coretmp.$zip_type" "$custcorelink" fi #校验内核 diff --git a/scripts/menus/9_upgrade.sh b/scripts/menus/9_upgrade.sh index f1d671eb..a7f9d804 100644 --- a/scripts/menus/9_upgrade.sh +++ b/scripts/menus/9_upgrade.sh @@ -354,7 +354,7 @@ setcustcore(){ #自定义内核 checkcustcore ;; 9) - read -p "请输入自定义内核的链接地址(必须是以.tar.gz或.gz结尾的压缩文件) > " link + read -p "请输入自定义内核的链接地址(必须是以.tar.gz、.upx或.gz结尾的压缩文件) > " link [ -n "$link" ] && custcorelink="$link" setcoretype getcore @@ -398,7 +398,7 @@ setcore() { [ -z "$crashcore" ] && crashcore="unknow" [ -z "$zip_type" ] && zip_type="tar.gz" echo "$crashcore" | grep -q 'singbox' && core_old=singbox || core_old=clash - [ -n "$custcorelink" ] && custcore="$(echo $custcorelink | sed 's#.*github.com##; s#/releases/download/#@#; s#-linux.*$##')" + [ -n "$custcorelink" ] && custcore="$(echo $custcorelink | sed 's#.*github.com##; s#/releases/download/#@#')" ### echo "-----------------------------------------------" [ -z "$cpucore" ] && check_cpucore