Compare commits

..

5 Commits

Author SHA1 Message Date
justin
54bbdc180a Remove inline comment in misc/alpine-tools.func 2026-01-29 10:23:17 +01:00
justin
f4495280cf AWK output needs to be sanitized 2026-01-29 10:23:17 +01:00
justin
16d0ffa19a $pattern doesn't need to be a parameter 2026-01-29 10:23:17 +01:00
justin
bf97037ba5 Remove bad quotes 2026-01-29 10:23:17 +01:00
justin
d7d16543e5 Fix url assignment in fetch_and_deploy_gh_release 2026-01-29 10:23:17 +01:00

View File

@ -277,7 +277,7 @@ fetch_and_deploy_gh_release() {
# $1 app, $2 repo, [$3 mode], [$4 version], [$5 target], [$6 asset_pattern # $1 app, $2 repo, [$3 mode], [$4 version], [$5 target], [$6 asset_pattern
local app="$1" repo="$2" mode="${3:-tarball}" version="${4:-latest}" target="${5:-/opt/$1}" pattern="${6:-}" local app="$1" repo="$2" mode="${3:-tarball}" version="${4:-latest}" target="${5:-/opt/$1}" pattern="${6:-}"
local app_lc local app_lc
app_lc="$(lower "$app" | tr -d ' ')" app_lc=$(lower "$app" | tr -d ' ')
local vfile="$HOME/.${app_lc}" local vfile="$HOME/.${app_lc}"
local json url filename tmpd unpack local json url filename tmpd unpack
@ -288,7 +288,7 @@ fetch_and_deploy_gh_release() {
need_tool curl jq tar || return 1 need_tool curl jq tar || return 1
[ "$mode" = "prebuild" ] || [ "$mode" = "singlefile" ] && need_tool unzip >/dev/null 2>&1 || true [ "$mode" = "prebuild" ] || [ "$mode" = "singlefile" ] && need_tool unzip >/dev/null 2>&1 || true
tmpd="$(mktemp -d)" || return 1 tmpd=$(mktemp -d) || return 1
mkdir -p "$target" mkdir -p "$target"
# Release JSON (with token/rate-limit handling) # Release JSON (with token/rate-limit handling)
@ -305,10 +305,10 @@ fetch_and_deploy_gh_release() {
return 1 return 1
} }
fi fi
json="$(cat "$tmpd/release.json")" json=$(cat "$tmpd/release.json")
# correct Version # correct Version
version="$(printf '%s' "$json" | jq -r '.tag_name // empty')" version=$(printf '%s' "$json" | jq -r '.tag_name // empty')
version="${version#v}" version="${version#v}"
[ -z "$version" ] && { [ -z "$version" ] && {
@ -317,9 +317,15 @@ fetch_and_deploy_gh_release() {
return 1 return 1
} }
get_url() {
printf '%s' "$json" | jq -r '.assets[].browser_download_url' |
awk -v p="$pattern" 'BEGIN{IGNORECASE=1} $0 ~ p {print; exit}' |
tr -d '[:cntrl:]'
}
case "$mode" in case "$mode" in
tarball | source) tarball | source)
url="$(printf '%s' "$json" | jq -r '.tarball_url // empty')" url=$(printf '%s' "$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"
download_with_progress "$url" "$tmpd/$filename" || { download_with_progress "$url" "$tmpd/$filename" || {
@ -331,7 +337,7 @@ fetch_and_deploy_gh_release() {
rm -rf "$tmpd" rm -rf "$tmpd"
return 1 return 1
} }
unpack="$(find "$tmpd" -mindepth 1 -maxdepth 1 -type d | head -n1)" unpack=$(find "$tmpd" -mindepth 1 -maxdepth 1 -type d | head -n1)
[ "${CLEAN_INSTALL:-0}" = "1" ] && rm -rf "${target:?}/"* [ "${CLEAN_INSTALL:-0}" = "1" ] && rm -rf "${target:?}/"*
# copy content of unpack to target # copy content of unpack to target
(cd "$unpack" && tar -cf - .) | (cd "$target" && tar -xf -) || { (cd "$unpack" && tar -cf - .) | (cd "$target" && tar -xf -) || {
@ -342,7 +348,7 @@ fetch_and_deploy_gh_release() {
;; ;;
binary) binary)
[ -n "$pattern" ] || pattern="*.apk" [ -n "$pattern" ] || pattern="*.apk"
url="$(printf '%s' "$json" | jq -r '.assets[].browser_download_url' | awk -v p="$pattern" 'BEGIN{IGNORECASE=1} $0 ~ p {print; exit}')" url=$(get_url)
[ -z "$url" ] && { [ -z "$url" ] && {
msg_error "binary asset not found for pattern: $pattern" msg_error "binary asset not found for pattern: $pattern"
rm -rf "$tmpd" rm -rf "$tmpd"
@ -374,10 +380,7 @@ fetch_and_deploy_gh_release() {
rm -rf "$tmpd" rm -rf "$tmpd"
return 1 return 1
} }
url="$(printf '%s' "$json" | jq -r '.assets[].browser_download_url' | awk -v p="$pattern" ' url=$(get_url)
BEGIN{IGNORECASE=1}
$0 ~ p {print; exit}
')"
[ -z "$url" ] && { [ -z "$url" ] && {
msg_error "asset not found for pattern: $pattern" msg_error "asset not found for pattern: $pattern"
rm -rf "$tmpd" rm -rf "$tmpd"
@ -411,7 +414,7 @@ fetch_and_deploy_gh_release() {
[ "${CLEAN_INSTALL:-0}" = "1" ] && rm -rf "${target:?}/"* [ "${CLEAN_INSTALL:-0}" = "1" ] && rm -rf "${target:?}/"*
# top-level folder strippen # top-level folder strippen
if [ "$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ] && [ -z "$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type f | head -n1)" ]; then if [ "$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ] && [ -z "$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type f | head -n1)" ]; then
unpack="$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type d)" unpack=$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type d)
(cd "$unpack" && tar -cf - .) | (cd "$target" && tar -xf -) || { (cd "$unpack" && tar -cf - .) | (cd "$target" && tar -xf -) || {
msg_error "copy failed" msg_error "copy failed"
rm -rf "$tmpd" rm -rf "$tmpd"
@ -431,10 +434,7 @@ fetch_and_deploy_gh_release() {
rm -rf "$tmpd" rm -rf "$tmpd"
return 1 return 1
} }
url="$(printf '%s' "$json" | jq -r '.assets[].browser_download_url' | awk -v p="$pattern" ' url=$(get_url)
BEGIN{IGNORECASE=1}
$0 ~ p {print; exit}
')"
[ -z "$url" ] && { [ -z "$url" ] && {
msg_error "asset not found for pattern: $pattern" msg_error "asset not found for pattern: $pattern"
rm -rf "$tmpd" rm -rf "$tmpd"