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:21:04 +08:00
parent 5e7a46c378
commit 6b6740a725
3 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/lang/chs/9_upgrade.lang
View File

@@ -52,11 +52,6 @@ UPG_PAC_GUIDE_TEXT="PAC的使用教程请参考："
UPG_THANKS_PROJECTS="感谢以下项目及其开发者们的无私奉献！" UPG_THANKS_PROJECTS="感谢以下项目及其开发者们的无私奉献！"
UPG_THANKS_SPECIAL_TEXT="特别感谢：\033[36m所有帮助及赞助过此项目的同仁们！\033[0m" UPG_THANKS_SPECIAL_TEXT="特别感谢：\033[36m所有帮助及赞助过此项目的同仁们！\033[0m"
UPG_GETTING_UPDATE="正在检查更新......" UPG_GETTING_UPDATE="正在检查更新......"
UPG_GET_OK="检查更新成功"
UPG_GET_FAIL="检查更新失败！请尝试切换其他安装源！"
UPG_EXTRACT_START="开始解压文件......"
UPG_SCRIPT_UPDATE_OK="脚本更新成功！"
UPG_SCRIPT_UPDATE_PROMPT="注意：更新时会停止服务！"
UPG_SCRIPT_CUR_VER_TEXT="当前脚本版本为：" UPG_SCRIPT_CUR_VER_TEXT="当前脚本版本为："
UPG_SCRIPT_NEW_VER_TEXT="最新脚本版本为：" UPG_SCRIPT_NEW_VER_TEXT="最新脚本版本为："
UPG_UPDATE_NOW_TEXT="立即更新" UPG_UPDATE_NOW_TEXT="立即更新"
@@ -88,6 +83,9 @@ UPG_CUSTOM_CORE_TASK_WARN="自定义内核已适配定时任务，但不支持
UPG_CUSTOM_CORE_NET_WARN="如遇到网络错误请先启动ShellCrash服务！" UPG_CUSTOM_CORE_NET_WARN="如遇到网络错误请先启动ShellCrash服务！"
UPG_CUSTOM_CORE_CURRENT="当前内核为：" UPG_CUSTOM_CORE_CURRENT="当前内核为："
UPG_CUSTOM_CORE_SELECT="请选择需要使用的核心：" UPG_CUSTOM_CORE_SELECT="请选择需要使用的核心："
UPG_CUSTOM_CORE_MENU_OFFICIAL="版本官方内核"
UPG_CUSTOM_CORE_MENU_ALPHA="版本内核（支持Smart策略）"
UPG_CUSTOM_CORE_MENU_MULTI="多版本内核"
UPG_CUSTOM_CORE_LINK_HINT="请输入自定义内核的链接地址" UPG_CUSTOM_CORE_LINK_HINT="请输入自定义内核的链接地址"
UPG_CUSTOM_CORE_LINK_HINT2="（必须是以.tar.gz、.upx或.gz结尾的压缩文件）" UPG_CUSTOM_CORE_LINK_HINT2="（必须是以.tar.gz、.upx或.gz结尾的压缩文件）"
UPG_CUSTOM_CORE_LINK_HINT3="或者输入 0 返回上级菜单" UPG_CUSTOM_CORE_LINK_HINT3="或者输入 0 返回上级菜单"
@@ -117,8 +115,6 @@ UPG_CORE_MENU_6_SUFFIX=""
UPG_CORE_MENU_7="7) \033[32m更新当前内核\033[0m" UPG_CORE_MENU_7="7) \033[32m更新当前内核\033[0m"
UPG_CORE_MENU_9="9) 手动指定处理器架构" UPG_CORE_MENU_9="9) 手动指定处理器架构"
UPG_GEO_GETTING="正在从服务器获取数据库文件......" UPG_GEO_GETTING="正在从服务器获取数据库文件......"
UPG_GEO_FAIL="文件下载失败！"
UPG_GEO_EXTRACT_FAIL="文件解压失败！"
UPG_GEO_OK_PREFIX="" UPG_GEO_OK_PREFIX=""
UPG_GEO_OK_SUFFIX="数据库文件下载成功！" UPG_GEO_OK_SUFFIX="数据库文件下载成功！"
UPG_GEO_LINKING="正在获取数据库文件......" UPG_GEO_LINKING="正在获取数据库文件......"
@@ -142,7 +138,6 @@ UPG_GEO_CLEAN_CONFIRM="确认清理"
UPG_GEO_CLEAN_OK="所有数据库文件均已清理！" UPG_GEO_CLEAN_OK="所有数据库文件均已清理！"
UPG_DB_GETTING="正在连接服务器获取安装文件......" UPG_DB_GETTING="正在连接服务器获取安装文件......"
UPG_DB_DOWNLOAD_OK="下载成功，正在解压文件......" UPG_DB_DOWNLOAD_OK="下载成功，正在解压文件......"
UPG_DB_EXTRACT_FAIL="文件解压失败！"
UPG_DB_OK="面板安装成功！" UPG_DB_OK="面板安装成功！"
UPG_DB_REFRESH_HINT="如未生效，请使用【Ctrl+F5】强制刷新浏览器！" UPG_DB_REFRESH_HINT="如未生效，请使用【Ctrl+F5】强制刷新浏览器！"
UPG_DB_INSTALLED="检测到已经安装过本地面板" UPG_DB_INSTALLED="检测到已经安装过本地面板"
@@ -167,8 +162,6 @@ UPG_DB_UNINSTALL="9) \033[31m卸载本地面板\033[0m"
UPG_DB_UNINSTALL_CONFIRM="是否卸载本地面板？" UPG_DB_UNINSTALL_CONFIRM="是否卸载本地面板？"
UPG_DB_UNINSTALL_YES="1) 确认卸载" UPG_DB_UNINSTALL_YES="1) 确认卸载"
UPG_DB_UNINSTALL_OK="面板已经卸载！" UPG_DB_UNINSTALL_OK="面板已经卸载！"
UPG_CRT_DB_GETTING="正在连接服务器获取安装文件......"
UPG_CRT_DB_DOWNLOAD_FAIL="文件下载失败！"
UPG_CRT_DB_OK="证书安装成功！" UPG_CRT_DB_OK="证书安装成功！"
UPG_CRT_TITLE1="安装/更新本地根证书文件（ca-certificates.crt）" UPG_CRT_TITLE1="安装/更新本地根证书文件（ca-certificates.crt）"
UPG_CRT_TITLE2="用于解决证书校验错误，x509报错等问题" UPG_CRT_TITLE2="用于解决证书校验错误，x509报错等问题"
@@ -216,7 +209,6 @@ UPG_THANKS_ITEM_REF1ND_URL="项目地址：https://github.com/reF1nd/sing-box"
UPG_THANKS_ITEM_DUSTIN="DustinWin 开发：DustinWin" UPG_THANKS_ITEM_DUSTIN="DustinWin 开发：DustinWin"
UPG_THANKS_ITEM_DUSTIN_URL="开发者地址：https://github.com/DustinWin" UPG_THANKS_ITEM_DUSTIN_URL="开发者地址：https://github.com/DustinWin"
UPG_CORE_GET_LINK_TITLE="正在获取内核文件链接......" UPG_CORE_GET_LINK_TITLE="正在获取内核文件链接......"
UPG_CUSTOM_CORE_CURRENT_TEXT="当前内核为："
UPG_CUSTOM_CORE_NOTE1="不支持Gvisor、Tailscale、Wireguard、NaiveProxy" UPG_CUSTOM_CORE_NOTE1="不支持Gvisor、Tailscale、Wireguard、NaiveProxy"
UPG_CORE_V1_PREFIX="1) \033[43;30mMihomo\033[0m：\033[32m" UPG_CORE_V1_PREFIX="1) \033[43;30mMihomo\033[0m：\033[32m"
UPG_CORE_V1_SUFFIX=" \033[32m（原meta内核）支持全面\033[0m \033[33m占用略高\033[0m" UPG_CORE_V1_SUFFIX=" \033[32m（原meta内核）支持全面\033[0m \033[33m占用略高\033[0m"
@@ -251,8 +243,6 @@ UPG_GEO_CLEAN_WARN_SUFFIX="目录及/ruleset目录下所有数据库文件！"
UPG_GEO_CLEAN_WARN2="清理后启动服务即可自动下载所需文件" UPG_GEO_CLEAN_WARN2="清理后启动服务即可自动下载所需文件"
UPG_GEO_CLEANED="所有数据库文件均已清理！" UPG_GEO_CLEANED="所有数据库文件均已清理！"
UPG_DB_CONNECTING="正在连接服务器获取安装文件......" UPG_DB_CONNECTING="正在连接服务器获取安装文件......"
UPG_DB_DOWNLOAD_FAIL="文件下载失败！"
UPG_DB_EXTRACT_FAIL_TEXT="文件解压失败！"
UPG_DB_INSTALLED_HINT="检测到已经安装过本地面板" UPG_DB_INSTALLED_HINT="检测到已经安装过本地面板"
UPG_DB_INSTALL_CANCEL="安装已取消" UPG_DB_INSTALL_CANCEL="安装已取消"
UPG_DB_DIR_TITLE="请选择面板安装目录：" UPG_DB_DIR_TITLE="请选择面板安装目录："
@@ -271,7 +261,6 @@ UPG_DB_UNINSTALL_PROMPT="是否卸载本地面板？"
UPG_DB_UNINSTALL_CONFIRM_TEXT="1) 确认卸载" UPG_DB_UNINSTALL_CONFIRM_TEXT="1) 确认卸载"
UPG_DB_UNINSTALLED="面板已经卸载！" UPG_DB_UNINSTALLED="面板已经卸载！"
UPG_CRT_CONNECTING="正在连接服务器获取安装文件......" UPG_CRT_CONNECTING="正在连接服务器获取安装文件......"
UPG_CRT_INSTALL_OK="证书安装成功！"
UPG_CRT_INSTALL_TITLE1="安装/更新本地根证书文件（ca-certificates.crt）" UPG_CRT_INSTALL_TITLE1="安装/更新本地根证书文件（ca-certificates.crt）"
UPG_CRT_INSTALL_TITLE2="用于解决证书校验错误，x509报错等问题" UPG_CRT_INSTALL_TITLE2="用于解决证书校验错误，x509报错等问题"
UPG_CRT_INSTALL_TITLE3="无上述问题的设备请勿使用！" UPG_CRT_INSTALL_TITLE3="无上述问题的设备请勿使用！"

17
scripts/lang/en/9_upgrade.lang
View File

@@ -52,11 +52,6 @@ UPG_PAC_GUIDE_TEXT="PAC guide: "
UPG_THANKS_PROJECTS="Thanks to the following projects and developers!" UPG_THANKS_PROJECTS="Thanks to the following projects and developers!"
UPG_THANKS_SPECIAL_TEXT="Special thanks: \033[36mall contributors and sponsors!\033[0m" UPG_THANKS_SPECIAL_TEXT="Special thanks: \033[36mall contributors and sponsors!\033[0m"
UPG_GETTING_UPDATE="Checking updates..." UPG_GETTING_UPDATE="Checking updates..."
UPG_GET_OK="Update check succeeded"
UPG_GET_FAIL="Update check failed! Please switch source and retry!"
UPG_EXTRACT_START="Extracting files..."
UPG_SCRIPT_UPDATE_OK="Script update succeeded!"
UPG_SCRIPT_UPDATE_PROMPT="Note: service will be stopped during update!"
UPG_SCRIPT_CUR_VER_TEXT="Current script version: " UPG_SCRIPT_CUR_VER_TEXT="Current script version: "
UPG_SCRIPT_NEW_VER_TEXT="Latest script version: " UPG_SCRIPT_NEW_VER_TEXT="Latest script version: "
UPG_UPDATE_NOW_TEXT="Update now" UPG_UPDATE_NOW_TEXT="Update now"
@@ -88,6 +83,9 @@ UPG_CUSTOM_CORE_TASK_WARN="Custom cores support scheduled tasks but do not suppo
UPG_CUSTOM_CORE_NET_WARN="If you encounter network errors, start the ShellCrash service first!" UPG_CUSTOM_CORE_NET_WARN="If you encounter network errors, start the ShellCrash service first!"
UPG_CUSTOM_CORE_CURRENT="Current core: " UPG_CUSTOM_CORE_CURRENT="Current core: "
UPG_CUSTOM_CORE_SELECT="Please choose the core you want to use:" UPG_CUSTOM_CORE_SELECT="Please choose the core you want to use:"
UPG_CUSTOM_CORE_MENU_OFFICIAL=" official core"
UPG_CUSTOM_CORE_MENU_ALPHA=" core (supports Smart strategy)"
UPG_CUSTOM_CORE_MENU_MULTI=" multi-version core"
UPG_CUSTOM_CORE_LINK_HINT="Please enter the custom core URL" UPG_CUSTOM_CORE_LINK_HINT="Please enter the custom core URL"
UPG_CUSTOM_CORE_LINK_HINT2="(must end with .tar.gz, .upx, or .gz)" UPG_CUSTOM_CORE_LINK_HINT2="(must end with .tar.gz, .upx, or .gz)"
UPG_CUSTOM_CORE_LINK_HINT3="Or enter 0 to return to the previous menu" UPG_CUSTOM_CORE_LINK_HINT3="Or enter 0 to return to the previous menu"
@@ -117,8 +115,6 @@ UPG_CORE_MENU_6_SUFFIX=""
UPG_CORE_MENU_7="7) \033[32mUpdate current core\033[0m" UPG_CORE_MENU_7="7) \033[32mUpdate current core\033[0m"
UPG_CORE_MENU_9="9) Manually specify CPU architecture" UPG_CORE_MENU_9="9) Manually specify CPU architecture"
UPG_GEO_GETTING="Fetching database files from the server..." UPG_GEO_GETTING="Fetching database files from the server..."
UPG_GEO_FAIL="Download failed!"
UPG_GEO_EXTRACT_FAIL="Extraction failed!"
UPG_GEO_OK_PREFIX="" UPG_GEO_OK_PREFIX=""
UPG_GEO_OK_SUFFIX=" database file downloaded successfully!" UPG_GEO_OK_SUFFIX=" database file downloaded successfully!"
UPG_GEO_LINKING="Fetching database files..." UPG_GEO_LINKING="Fetching database files..."
@@ -142,7 +138,6 @@ UPG_GEO_CLEAN_CONFIRM="Confirm cleanup"
UPG_GEO_CLEAN_OK="All database files have been cleaned!" UPG_GEO_CLEAN_OK="All database files have been cleaned!"
UPG_DB_GETTING="Connecting to the server to fetch installation files..." UPG_DB_GETTING="Connecting to the server to fetch installation files..."
UPG_DB_DOWNLOAD_OK="Download succeeded, extracting files..." UPG_DB_DOWNLOAD_OK="Download succeeded, extracting files..."
UPG_DB_EXTRACT_FAIL="Extraction failed!"
UPG_DB_OK="Panel installed successfully!" UPG_DB_OK="Panel installed successfully!"
UPG_DB_REFRESH_HINT="If it does not take effect, use Ctrl+F5 to force-refresh the browser!" UPG_DB_REFRESH_HINT="If it does not take effect, use Ctrl+F5 to force-refresh the browser!"
UPG_DB_INSTALLED="A local panel is already installed" UPG_DB_INSTALLED="A local panel is already installed"
@@ -167,8 +162,6 @@ UPG_DB_UNINSTALL="9) \033[31mUninstall local panel\033[0m"
UPG_DB_UNINSTALL_CONFIRM="Uninstall the local panel?" UPG_DB_UNINSTALL_CONFIRM="Uninstall the local panel?"
UPG_DB_UNINSTALL_YES="1) Confirm uninstall" UPG_DB_UNINSTALL_YES="1) Confirm uninstall"
UPG_DB_UNINSTALL_OK="Panel has been uninstalled!" UPG_DB_UNINSTALL_OK="Panel has been uninstalled!"
UPG_CRT_DB_GETTING="Connecting to the server to fetch installation files..."
UPG_CRT_DB_DOWNLOAD_FAIL="Download failed!"
UPG_CRT_DB_OK="Certificate installed successfully!" UPG_CRT_DB_OK="Certificate installed successfully!"
UPG_CRT_TITLE1="Install / update local root certificate file (ca-certificates.crt)" UPG_CRT_TITLE1="Install / update local root certificate file (ca-certificates.crt)"
UPG_CRT_TITLE2="Used to fix certificate verification errors, x509 errors, and similar issues" UPG_CRT_TITLE2="Used to fix certificate verification errors, x509 errors, and similar issues"
@@ -216,7 +209,6 @@ UPG_THANKS_ITEM_REF1ND_URL="Project: https://github.com/reF1nd/sing-box"
UPG_THANKS_ITEM_DUSTIN="DustinWin Developer: DustinWin" UPG_THANKS_ITEM_DUSTIN="DustinWin Developer: DustinWin"
UPG_THANKS_ITEM_DUSTIN_URL="Developer: https://github.com/DustinWin" UPG_THANKS_ITEM_DUSTIN_URL="Developer: https://github.com/DustinWin"
UPG_CORE_GET_LINK_TITLE="Fetching core file links..." UPG_CORE_GET_LINK_TITLE="Fetching core file links..."
UPG_CUSTOM_CORE_CURRENT_TEXT="Current core: "
UPG_CUSTOM_CORE_NOTE1="Gvisor, Tailscale, Wireguard, and NaiveProxy are not supported" UPG_CUSTOM_CORE_NOTE1="Gvisor, Tailscale, Wireguard, and NaiveProxy are not supported"
UPG_CORE_V1_PREFIX="1) \033[43;30mMihomo\033[0m: \033[32m" UPG_CORE_V1_PREFIX="1) \033[43;30mMihomo\033[0m: \033[32m"
UPG_CORE_V1_SUFFIX=" \033[32m(full meta core) highly compatible\033[0m \033[33mmore resource usage\033[0m" UPG_CORE_V1_SUFFIX=" \033[32m(full meta core) highly compatible\033[0m \033[33mmore resource usage\033[0m"
@@ -251,8 +243,6 @@ UPG_GEO_CLEAN_WARN_SUFFIX=" and /ruleset!"
UPG_GEO_CLEAN_WARN2="After cleanup, start the service to download the required files automatically" UPG_GEO_CLEAN_WARN2="After cleanup, start the service to download the required files automatically"
UPG_GEO_CLEANED="All database files have been cleaned!" UPG_GEO_CLEANED="All database files have been cleaned!"
UPG_DB_CONNECTING="Connecting to the server to fetch installation files..." UPG_DB_CONNECTING="Connecting to the server to fetch installation files..."
UPG_DB_DOWNLOAD_FAIL="Download failed!"
UPG_DB_EXTRACT_FAIL_TEXT="Extraction failed!"
UPG_DB_INSTALLED_HINT="A local panel is already installed" UPG_DB_INSTALLED_HINT="A local panel is already installed"
UPG_DB_INSTALL_CANCEL="Installation cancelled" UPG_DB_INSTALL_CANCEL="Installation cancelled"
UPG_DB_DIR_TITLE="Please choose the panel install directory:" UPG_DB_DIR_TITLE="Please choose the panel install directory:"
@@ -271,7 +261,6 @@ UPG_DB_UNINSTALL_PROMPT="Uninstall the local panel?"
UPG_DB_UNINSTALL_CONFIRM_TEXT="1) Confirm uninstall" UPG_DB_UNINSTALL_CONFIRM_TEXT="1) Confirm uninstall"
UPG_DB_UNINSTALLED="Panel has been uninstalled!" UPG_DB_UNINSTALLED="Panel has been uninstalled!"
UPG_CRT_CONNECTING="Connecting to the server to fetch installation files..." UPG_CRT_CONNECTING="Connecting to the server to fetch installation files..."
UPG_CRT_INSTALL_OK="Certificate installed successfully!"
UPG_CRT_INSTALL_TITLE1="Install / update local root certificate file (ca-certificates.crt)" UPG_CRT_INSTALL_TITLE1="Install / update local root certificate file (ca-certificates.crt)"
UPG_CRT_INSTALL_TITLE2="Used to fix certificate verification errors, x509 errors, and similar issues" UPG_CRT_INSTALL_TITLE2="Used to fix certificate verification errors, x509 errors, and similar issues"
UPG_CRT_INSTALL_TITLE3="Do not use on devices without the above issues!" UPG_CRT_INSTALL_TITLE3="Do not use on devices without the above issues!"

27
scripts/menus/9_upgrade.sh
View File

@@ -391,7 +391,7 @@ checkcustcore() {
setcustcore() { setcustcore() {
while true; do while true; do
[ -z "$cpucore" ] && check_cpucore [ -z "$cpucore" ] && check_cpucore
[ -n "$custcorelink" ] && custcore="$(echo "$custcorelink" | sed 's#.*github.com##; s#/releases/download/#@#')" [ -n "$custcorelink" ] && custcore="$(echo "$custcorelink" | sed 's#.*github.com##; s#/releases/download/#@#')"
line_break line_break
separator_line "=" separator_line "="
content_line "\033[36m$UPG_CUSTOM_CORE_SOURCE\033[0m" content_line "\033[36m$UPG_CUSTOM_CORE_SOURCE\033[0m"
@@ -399,17 +399,16 @@ setcustcore() {
content_line "\033[31m$UPG_CUSTOM_CORE_TASK_WARN\033[0m" content_line "\033[31m$UPG_CUSTOM_CORE_TASK_WARN\033[0m"
content_line "\033[32m$UPG_CUSTOM_CORE_NET_WARN\033[0m" content_line "\033[32m$UPG_CUSTOM_CORE_NET_WARN\033[0m"
[ -n "$custcore" ] && { [ -n "$custcore" ] && {
content_line "$UPG_CUSTOM_CORE_CURRENT_TEXT" content_line "$UPG_CUSTOM_CORE_CURRENT\033[36m$custcore\033[0m"
content_line "\033[36m$custcore\033[0m"
} }
separator_line "=" separator_line "="
content_line "$UPG_CUSTOM_CORE_SELECT" content_line "$UPG_CUSTOM_CORE_SELECT"
separator_line "-" separator_line "-"
btm_box "1) \033[36mMetaCubeX/mihomo\033[32m@release\033[0m版本官方内核" \ btm_box "1) \033[36mMetaCubeX/mihomo\033[32m@release\033[0m$UPG_CUSTOM_CORE_MENU_OFFICIAL" \
"2) \033[36mvernesong/mihomo\033[32m@alpha\033[0m版本内核(支持Smart策略)" \ "2) \033[36mvernesong/mihomo\033[32m@alpha\033[0m$UPG_CUSTOM_CORE_MENU_ALPHA" \
"3) \033[36mSagerNet/sing-box\033[32m@release\033[0m版本官方内核" \ "3) \033[36mSagerNet/sing-box\033[32m@release\033[0m$UPG_CUSTOM_CORE_MENU_OFFICIAL" \
"4) \033[36mDustinWin/mihomo\033[0m多版本内核" \ "4) \033[36mDustinWin/mihomo\033[0m$UPG_CUSTOM_CORE_MENU_MULTI" \
"5) \033[36mDustinWin/sing-boxr\033[0m多版本内核" \ "5) \033[36mDustinWin/sing-boxr\033[0m$UPG_CUSTOM_CORE_MENU_MULTI" \
"$UPG_CORE_MENU_9" \ "$UPG_CORE_MENU_9" \
"" \ "" \
"0) $COMMON_BACK" "0) $COMMON_BACK"
@@ -596,7 +595,7 @@ getgeo() {
content_line "$UPG_GEO_GETTING" content_line "$UPG_GEO_GETTING"
get_bin "$TMPDIR"/"${geoname}" bin/geodata/"$geotype" get_bin "$TMPDIR"/"${geoname}" bin/geodata/"$geotype"
if [ "$?" = "1" ]; then if [ "$?" = "1" ]; then
content_line "\033[31m$UPG_GEO_FAIL\033[0m" content_line "\033[31m$UPG_DOWNLOAD_FAIL\033[0m"
error_down error_down
else else
echo "$geoname" | grep -Eq '.mrs|.srs|.tar.gz' && { echo "$geoname" | grep -Eq '.mrs|.srs|.tar.gz' && {
@@ -606,7 +605,7 @@ getgeo() {
if echo "$geoname" | grep -Eq '.tar.gz'; then if echo "$geoname" | grep -Eq '.tar.gz'; then
tar -zxf "$TMPDIR"/"${geoname}" ${tar_para} -C "$BINDIR"/"${geofile}" >/dev/null tar -zxf "$TMPDIR"/"${geoname}" ${tar_para} -C "$BINDIR"/"${geofile}" >/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
content_line "$UPG_GEO_EXTRACT_FAIL" content_line "$UPG_EXTRACT_FAIL"
separator_line "=" separator_line "="
sleep 1 sleep 1
line_break line_break
@@ -630,7 +629,7 @@ getcustgeo() {
content_line "$UPG_GEO_LINKING" content_line "$UPG_GEO_LINKING"
webget "$TMPDIR"/"$geoname" "$custgeolink" webget "$TMPDIR"/"$geoname" "$custgeolink"
if [ "$?" = "1" ]; then if [ "$?" = "1" ]; then
content_line "\033[31m$UPG_GEO_FAIL\033[0m" content_line "\033[31m$UPG_DOWNLOAD_FAIL\033[0m"
error_down error_down
else else
echo "$geoname" | grep -Eq '.mrs|.srs' && { echo "$geoname" | grep -Eq '.mrs|.srs' && {
@@ -867,7 +866,7 @@ getdb() {
content_line "$UPG_DB_GETTING" content_line "$UPG_DB_GETTING"
get_bin "$TMPDIR"/clashdb.tar.gz bin/dashboard/${db_type}.tar.gz get_bin "$TMPDIR"/clashdb.tar.gz bin/dashboard/${db_type}.tar.gz
if [ "$?" = "1" ]; then if [ "$?" = "1" ]; then
content_line "\033[31m$UPG_GEO_FAIL\033[0m" content_line "\033[31m$UPG_DOWNLOAD_FAIL\033[0m"
error_down error_down
return 1 return 1
else else
@@ -875,7 +874,7 @@ getdb() {
mkdir -p "$dbdir" >/dev/null mkdir -p "$dbdir" >/dev/null
tar -zxf "$TMPDIR/clashdb.tar.gz" ${tar_para} -C "$dbdir" >/dev/null tar -zxf "$TMPDIR/clashdb.tar.gz" ${tar_para} -C "$dbdir" >/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
content_line "$UPG_GEO_EXTRACT_FAIL" content_line "$UPG_EXTRACT_FAIL"
separator_line "=" separator_line "="
line_break line_break
sleep 1 sleep 1
@@ -1036,7 +1035,7 @@ getcrt() {
content_line "$UPG_DB_GETTING" content_line "$UPG_DB_GETTING"
get_bin "$TMPDIR"/ca-certificates.crt bin/fix/ca-certificates.crt echooff get_bin "$TMPDIR"/ca-certificates.crt bin/fix/ca-certificates.crt echooff
if [ "$?" = "1" ]; then if [ "$?" = "1" ]; then
content_line "\033[31m$UPG_GEO_FAIL\033[0m" content_line "\033[31m$UPG_DOWNLOAD_FAIL\033[0m"
error_down error_down
else else
[ "$systype" = 'mi_snapshot' ] && cp -f "$TMPDIR"/ca-certificates.crt "$CRASHDIR"/tools #镜像化设备特殊处理 [ "$systype" = 'mi_snapshot' ] && cp -f "$TMPDIR"/ca-certificates.crt "$CRASHDIR"/tools #镜像化设备特殊处理