Skip to content

Commit 7290bb1

Browse files
Buguinljharb
authored andcommitted
Skip checksum when download file failed.
1 parent 87a7097 commit 7290bb1

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

Diff for: nvm.sh

+18-12
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,24 @@ nvm_download() {
128128
if nvm_curl_use_compression; then
129129
CURL_COMPRESSED_FLAG="--compressed"
130130
fi
131-
eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
131+
eval "curl -q --fail -w %{http_code} ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
132132
elif nvm_has "wget"; then
133133
# Emulate curl with wget
134134
ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
135-
-e 's/--compressed //' \
136-
-e 's/--fail //' \
137-
-e 's/-L //' \
138-
-e 's/-I /--server-response /' \
139-
-e 's/-s /-q /' \
140-
-e 's/-sS /-nv /' \
141-
-e 's/-o /-O /' \
142-
-e 's/-C - /-c /')
135+
-e 's/--compressed //' \
136+
-e 's/--fail //' \
137+
-e 's/-L //' \
138+
-e 's/-I /--server-response /' \
139+
-e 's/-s /-q /' \
140+
-e 's/-sS /-nv /' \
141+
-e 's/-o /-O /' \
142+
-e 's/-C - /-c /')
143143

144144
if [ -n "${NVM_AUTH_HEADER:-}" ]; then
145145
ARGS="${ARGS} --header \"${NVM_AUTH_HEADER}\""
146146
fi
147147
# shellcheck disable=SC2086
148-
eval wget $ARGS
148+
eval wget -S $ARGS 2>&1 | grep '^ HTTP/' | awk '{print $2}'
149149
fi
150150
}
151151

@@ -2434,12 +2434,18 @@ nvm_download_artifact() {
24342434
nvm_err "Removing the broken local cache..."
24352435
command rm -rf "${TARBALL}"
24362436
fi
2437+
24372438
nvm_err "Downloading ${TARBALL_URL}..."
2438-
nvm_download -L -C - "${PROGRESS_BAR}" "${TARBALL_URL}" -o "${TARBALL}" || (
2439+
local NVM_DOWNLOAD_RESULT
2440+
NVM_DOWNLOAD_RESULT=$(nvm_download -L -C - "${PROGRESS_BAR}" "${TARBALL_URL}" -o "${TARBALL}")
2441+
if [ "${NVM_DEBUG-}" = 1 ]; then
2442+
nvm_err "Download HTTP Status ${NVM_DOWNLOAD_RESULT}"
2443+
fi
2444+
if [ "${NVM_DOWNLOAD_RESULT}" != '200' ]; then
24392445
command rm -rf "${TARBALL}" "${tmpdir}"
24402446
nvm_err "Binary download from ${TARBALL_URL} failed, trying source."
24412447
return 4
2442-
)
2448+
fi
24432449

24442450
if nvm_grep '404 Not Found' "${TARBALL}" >/dev/null; then
24452451
command rm -rf "${TARBALL}" "${tmpdir}"

0 commit comments

Comments
 (0)