mirror of
https://github.com/MengMengCode/CLICD.git
synced 2026-08-08 06:24:44 +08:00
修复安装脚本下载失败处理
This commit is contained in:
+8
-5
@@ -54,7 +54,7 @@ run_step() {
|
|||||||
step_name="$1"
|
step_name="$1"
|
||||||
shift
|
shift
|
||||||
log "开始:$step_name"
|
log "开始:$step_name"
|
||||||
if "$@" >> "$LOG_FILE" 2>&1; then
|
if ( "$@" ) >> "$LOG_FILE" 2>&1; then
|
||||||
log "完成:$step_name"
|
log "完成:$step_name"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
@@ -846,15 +846,18 @@ download_release_if_needed() {
|
|||||||
trap 'rm -rf "$tmp_dir"' 0
|
trap 'rm -rf "$tmp_dir"' 0
|
||||||
|
|
||||||
if has_cmd curl; then
|
if has_cmd curl; then
|
||||||
curl -fL "$download_url" -o "$tmp_dir/$ASSET"
|
curl -fL --retry 6 --retry-delay 2 --connect-timeout 20 --max-time 600 "$download_url" -o "$tmp_dir/$ASSET" ||
|
||||||
|
die "Release package download failed: $download_url"
|
||||||
elif has_cmd wget; then
|
elif has_cmd wget; then
|
||||||
wget -O "$tmp_dir/$ASSET" "$download_url"
|
wget --tries=6 --timeout=30 --waitretry=2 -O "$tmp_dir/$ASSET" "$download_url" ||
|
||||||
|
die "Release package download failed: $download_url"
|
||||||
else
|
else
|
||||||
die "下载发行版包需要 curl 或 wget。"
|
die "下载发行版包需要 curl 或 wget。"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tar -xzf "$tmp_dir/$ASSET" -C "$tmp_dir"
|
[ -s "$tmp_dir/$ASSET" ] || die "Release package is empty: $download_url"
|
||||||
cd "$tmp_dir/clicd-linux-amd64"
|
tar -xzf "$tmp_dir/$ASSET" -C "$tmp_dir" || die "Failed to extract release package: $tmp_dir/$ASSET"
|
||||||
|
cd "$tmp_dir/clicd-linux-amd64" || die "Release package layout is invalid: missing clicd-linux-amd64 directory"
|
||||||
[ -f "./clicd" ] || die "下载的发行版包中未找到 clicd 二进制。"
|
[ -f "./clicd" ] || die "下载的发行版包中未找到 clicd 二进制。"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user