mirror/clash-for-linux
1
0
Fork 0
mirror of https://github.com/wnlen/clash-for-linux.git synced 2026-02-04 10:11:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update start.sh

Browse Source
This commit is contained in:
wnlen
2026-01-15 18:58:06 +08:00
parent e0f8d082f1
commit c4e0246f6c
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
start.sh
View File

@ -158,26 +158,41 @@ failure() {
} }
action() { action() {
local STRING rc local STRING
STRING=$1 STRING=$1
echo -n "$STRING "
shift shift
"$@" && success $"$STRING" || failure $"$STRING"
rc=$? # 执行命令本身的成功/失败，不应让 UI 输出影响返回码
echo if "$@"; then
return "$rc" success $"$STRING" || true
return 0
else
failure $"$STRING" || true
return 1
fi
} }
# 判断命令是否正常执行（手动模式：失败退出；systemd 模式：由调用处决定） # 判断命令是否正常执行
# - 手动模式：失败直接 exit
# - systemd 模式：只打印状态，不影响退出码
if_success() { if_success() {
local ok_msg=$1 local ok_msg=$1
local fail_msg=$2 local fail_msg=$2
local rc=$3 local rc=$3
if [ "$rc" -eq 0 ]; then if [ "$rc" -eq 0 ]; then
action "$ok_msg" /bin/true action "$ok_msg" /bin/true || true
return 0
fi
# rc != 0
action "$fail_msg" /bin/false || true
if [ "${SYSTEMD_MODE:-false}" = "true" ]; then
# systemd 下不允许在 UI 函数中 exit
return "$rc"
else else
action "$fail_msg" /bin/false exit "$rc"
exit 1
fi fi
} }
@ -257,11 +272,10 @@ if [ "$SKIP_CONFIG_REBUILD" != "true" ]; then
fi fi
if [ "$ReturnStatus" -eq 0 ]; then if [ "$ReturnStatus" -eq 0 ]; then
action "$Text1" /bin/true action "$Text1" /bin/true || true
else else
# systemd 模式：不退出，尝试使用旧配置/兜底配置继续启动
if [ "$SYSTEMD_MODE" = "true" ]; then if [ "$SYSTEMD_MODE" = "true" ]; then
action "$Text2（systemd 模式不退出，尝试使用旧配置/兜底配置）" /bin/false action "$Text2（systemd 模式不退出，尝试使用旧配置/兜底配置）" /bin/false || true
echo -e "\033[33m[WARN]\033[0m Subscribe check failed: http_code=${status_code:-unknown}, url=${URL}" >&2 echo -e "\033[33m[WARN]\033[0m Subscribe check failed: http_code=${status_code:-unknown}, url=${URL}" >&2
ensure_fallback_config ensure_fallback_config
SKIP_CONFIG_REBUILD=true SKIP_CONFIG_REBUILD=true
@ -331,10 +345,10 @@ if [ "$SKIP_CONFIG_REBUILD" != "true" ]; then
fi fi
if [ "$ReturnStatus" -eq 0 ]; then if [ "$ReturnStatus" -eq 0 ]; then
action "$Text3" /bin/true action "$Text3" /bin/true || true
else else
if [ "$SYSTEMD_MODE" = "true" ]; then if [ "$SYSTEMD_MODE" = "true" ]; then
action "$Text4（systemd 模式：下载失败，使用旧配置/兜底配置继续启动）" /bin/false action "$Text4（systemd 模式：下载失败，使用旧配置/兜底配置继续启动）" /bin/false || true
echo -e "\033[33m[WARN]\033[0m Download failed, will fallback. url=${URL}" >&2 echo -e "\033[33m[WARN]\033[0m Download failed, will fallback. url=${URL}" >&2
ensure_fallback_config ensure_fallback_config
SKIP_CONFIG_REBUILD=true SKIP_CONFIG_REBUILD=true
@ -496,7 +510,11 @@ if [ "$ReturnStatus" -eq 0 ]; then
fi fi
fi fi
if_success "$Text5" "$Text6" "$ReturnStatus" if [ "${SYSTEMD_MODE:-false}" = "true" ]; then
if_success "$Text5" "$Text6" "$ReturnStatus" || true
else
if_success "$Text5" "$Text6" "$ReturnStatus"
fi
#################### 输出信息 #################### #################### 输出信息 ####################