community-scripts/ProxmoxVED
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tools.func

Browse Source
This commit is contained in:
CanbiZ 2025-06-24 10:42:20 +02:00
parent a24076ae55
commit 16dc23afc8
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
misc/tools.func
View File

@ -741,12 +741,12 @@ function fetch_and_deploy_gh_release() {
local app_lc=$(echo "${app,,}" | tr -d ' ') local app_lc=$(echo "${app,,}" | tr -d ' ')
local version_file="$HOME/.${app_lc}" local version_file="$HOME/.${app_lc}"
local curl_timeout="--connect-timeout 10 --max-time 30"
local api_timeout="--connect-timeout 5 --max-time 10"
local download_timeout="--connect-timeout 15 --max-time 900"
local current_version="" local current_version=""
if [[ -f "$version_file" ]]; then [[ -f "$version_file" ]] && current_version=$(<"$version_file")
current_version=$(<"$version_file")
fi
if ! command -v jq &>/dev/null; then if ! command -v jq &>/dev/null; then
$STD apt-get install -y jq &>/dev/null $STD apt-get install -y jq &>/dev/null
@ -757,11 +757,22 @@ function fetch_and_deploy_gh_release() {
local header=() local header=()
[[ -n "${GITHUB_TOKEN:-}" ]] && header=(-H "Authorization: token $GITHUB_TOKEN") [[ -n "${GITHUB_TOKEN:-}" ]] && header=(-H "Authorization: token $GITHUB_TOKEN")
local resp http_code local max_retries=3 retry_delay=2 attempt=1 success=false resp http_code
resp=$(curl $curl_timeout -fsSL -w "%{http_code}" -o /tmp/gh_rel.json "${header[@]}" "$api_url")
while ((attempt <= max_retries)); do
resp=$(curl $api_timeout -fsSL -w "%{http_code}" -o /tmp/gh_rel.json "${header[@]}" "$api_url") && success=true && break
sleep "$retry_delay"
((attempt++))
done
if ! $success; then
msg_error "Failed to fetch release metadata after $max_retries attempts"
return 1
fi
http_code="${resp:(-3)}" http_code="${resp:(-3)}"
[[ "$http_code" != "200" ]] && { [[ "$http_code" != "200" ]] && {
msg_error "Failed to fetch release: HTTP $http_code" msg_error "GitHub API returned HTTP $http_code"
return 1 return 1
} }
@ -779,14 +790,14 @@ function fetch_and_deploy_gh_release() {
tmpdir=$(mktemp -d) || return 1 tmpdir=$(mktemp -d) || return 1
local filename="" url="" local filename="" url=""
msg_info "Fetching $app release ($version)" msg_info "Setup $app ($version)"
if [[ "$mode" == "tarball" || "$mode" == "source" ]]; then if [[ "$mode" == "tarball" || "$mode" == "source" ]]; then
url=$(echo "$json" | jq -r '.tarball_url // empty') url=$(echo "$json" | jq -r '.tarball_url // empty')
[[ -z "$url" ]] && url="https://github.com/$repo/archive/refs/tags/v$version.tar.gz" [[ -z "$url" ]] && url="https://github.com/$repo/archive/refs/tags/v$version.tar.gz"
filename="${app_lc}-${version}.tar.gz" filename="${app_lc}-${version}.tar.gz"
curl $curl_timeout -fsSL -o "$tmpdir/$filename" "$url" || { curl $download_timeout -fsSL -o "$tmpdir/$filename" "$url" || {
msg_error "Download failed: $url" msg_error "Download failed: $url"
rm -rf "$tmpdir" rm -rf "$tmpdir"
return 1 return 1
@ -830,7 +841,7 @@ function fetch_and_deploy_gh_release() {
fi fi
filename="${url_match##*/}" filename="${url_match##*/}"
curl $curl_timeout -fsSL -o "$tmpdir/$filename" "$url_match" || { curl $download_timeout -fsSL -o "$tmpdir/$filename" "$url_match" || {
msg_error "Download failed: $url_match" msg_error "Download failed: $url_match"
rm -rf "$tmpdir" rm -rf "$tmpdir"
return 1 return 1
@ -865,7 +876,7 @@ function fetch_and_deploy_gh_release() {
} }
filename="${asset_url##*/}" filename="${asset_url##*/}"
curl $curl_timeout -fsSL -o "$tmpdir/$filename" "$asset_url" || { curl $download_timeout -fsSL -o "$tmpdir/$filename" "$asset_url" || {
msg_error "Download failed: $asset_url" msg_error "Download failed: $asset_url"
rm -rf "$tmpdir" rm -rf "$tmpdir"
return 1 return 1
@ -906,7 +917,7 @@ function fetch_and_deploy_gh_release() {
filename="${asset_url##*/}" filename="${asset_url##*/}"
mkdir -p "$target" mkdir -p "$target"
curl $curl_timeout -fsSL -o "$target/$app" "$asset_url" || { curl $download_timeout -fsSL -o "$target/$app" "$asset_url" || {
msg_error "Download failed: $asset_url" msg_error "Download failed: $asset_url"
rm -rf "$tmpdir" rm -rf "$tmpdir"
return 1 return 1
@ -921,7 +932,7 @@ function fetch_and_deploy_gh_release() {
fi fi
echo "$version" >"$version_file" echo "$version" >"$version_file"
msg_ok "Fetched $app release ($version)" msg_ok "Setup $app ($version)"
rm -rf "$tmpdir" rm -rf "$tmpdir"
} }