Skip to content

Commit 74fe078

Browse files
author
Travis Lee
authored
get one tag only if there is more than one tag (#32)
1 parent eccfb82 commit 74fe078

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

curl-static-cross.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ url_from_github() {
258258
browser_download_urls=$(printf "%s" "${tags}" | jq -r '.assets[]' | grep browser_download_url || true)
259259

260260
if [ -z "${browser_download_urls}" ]; then
261-
tag_name=$(printf "%s" "${tags}" | jq -r '.tag_name')
261+
tag_name=$(printf "%s" "${tags}" | jq -r '.tag_name' | head -1)
262262
url="https://github.com/${repo}/archive/refs/tags/${tag_name}.tar.gz"
263263
else
264264
suffixes="tar.xz tar.gz tar.bz2 tgz"

curl-static-mac.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ url_from_github() {
115115
or (.name | contains(\"${version}\")))" "github-${repo#*/}.json")
116116
fi
117117

118-
browser_download_urls=$(echo "${tags}" | jq -r '.assets[]' | rg browser_download_url ||
119-
echo "${tags}" | rg browser_download_url || true)
118+
browser_download_urls=$(printf "%s" "${tags}" | jq -r '.assets[]' | rg browser_download_url ||
119+
printf "%s" "${tags}" | rg browser_download_url || true)
120120

121121
if [ -z "${browser_download_urls}" ]; then
122-
tag_name=$(echo "${tags}" | jq -r '.tag_name' ||
123-
echo "${tags}" | rg '"tag_name"' | sed 's/"tag_name": "\([^"]*\)",/\1/' | awk '{gsub(/^[ \t]+|[ \t]+$/, ""); print}')
124-
# parse error sometimes: Invalid string: control characters from U+0000 through U+001F must be escaped at line 51, column 1
122+
tag_name=$(printf "%s" "${tags}" | jq -r '.tag_name' | head -1 ||
123+
printf "%s" "${tags}" | rg '"tag_name"' | sed 's/"tag_name": "\([^"]*\)",/\1/' \
124+
| awk '{gsub(/^[ \t]+|[ \t]+$/, ""); print}' | head -1)
125125
url="https://github.com/${repo}/archive/refs/tags/${tag_name}.tar.gz"
126126
else
127127
suffixes="tar.xz tar.gz tar.bz2 tgz"
@@ -134,8 +134,9 @@ url_from_github() {
134134
fi
135135

136136
if [ -z "${url}" ]; then
137-
tag_name=$(echo "${tags}" | jq -r '.tag_name' ||
138-
echo "${tags}" | rg '"tag_name"' | sed 's/"tag_name": "\([^"]*\)",/\1/' | awk '{gsub(/^[ \t]+|[ \t]+$/, ""); print}')
137+
tag_name=$(printf "%s" "${tags}" | jq -r '.tag_name' | head -1 ||
138+
printf "%s" "${tags}" | rg '"tag_name"' | sed 's/"tag_name": "\([^"]*\)",/\1/' \
139+
| awk '{gsub(/^[ \t]+|[ \t]+$/, ""); print}' | head -1)
139140
url="https://github.com/${repo}/archive/refs/tags/${tag_name}.tar.gz"
140141
fi
141142

0 commit comments

Comments
 (0)