From e183c44d5a9a830f73c8a14285070c628748ad85 Mon Sep 17 00:00:00 2001 From: ryenus Date: Tue, 10 Jan 2023 15:32:47 +0800 Subject: [PATCH] bypass aliased curl Meanwhile keeping nvm_curl_version and nvm_curl_libz_support as-is to avoid breaking tests which redefines `curl` as a shell function. --- install.sh | 2 +- nvm.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index e8a3764..6b13cf4 100755 --- a/install.sh +++ b/install.sh @@ -90,7 +90,7 @@ nvm_node_version() { nvm_download() { if nvm_has "curl"; then - curl --fail --compressed -q "$@" + command curl --fail --compressed -q "$@" elif nvm_has "wget"; then # Emulate curl with wget ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \ diff --git a/nvm.sh b/nvm.sh index 7a7bbce..22f80e8 100644 --- a/nvm.sh +++ b/nvm.sh @@ -101,7 +101,7 @@ nvm_get_latest() { if nvm_curl_use_compression; then CURL_COMPRESSED_FLAG="--compressed" fi - NVM_LATEST_URL="$(curl ${CURL_COMPRESSED_FLAG:-} -q -w "%{url_effective}\\n" -L -s -S https://latest.nvm.sh -o /dev/null)" + NVM_LATEST_URL="$(command curl ${CURL_COMPRESSED_FLAG:-} -q -w "%{url_effective}\\n" -L -s -S https://latest.nvm.sh -o /dev/null)" elif nvm_has "wget"; then NVM_LATEST_URL="$(wget -q https://latest.nvm.sh --server-response -O /dev/null 2>&1 | command awk '/^ Location: /{DEST=$2} END{ print DEST }')" else @@ -121,7 +121,7 @@ nvm_download() { if nvm_curl_use_compression; then CURL_COMPRESSED_FLAG="--compressed" fi - curl --fail ${CURL_COMPRESSED_FLAG:-} -q "$@" + command curl --fail ${CURL_COMPRESSED_FLAG:-} -q "$@" elif nvm_has "wget"; then # Emulate curl with wget ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \