Merge 6375e4ed79dc584a8174e5816d68a1c31b6d9b27 into 0d5338166694e558ce315172f4ca93c20c0ded26

2025-08-20 04:23:43 +00:00 · 2024-08-23 17:45:35 +01:00
18 changed files with 2 additions and 10 deletions
--- a/nvm.sh
+++ b/nvm.sh
@ -128,12 +128,7 @@ nvm_download() {
    if nvm_curl_use_compression; then
      CURL_COMPRESSED_FLAG="--compressed"
    fi
-    local NVM_DOWNLOAD_ARGS
-    NVM_DOWNLOAD_ARGS=''
-    for arg in "$@"; do
-      NVM_DOWNLOAD_ARGS="${NVM_DOWNLOAD_ARGS} \"$arg\""
-    done
-    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} ${NVM_DOWNLOAD_ARGS}"
+    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
  elif nvm_has "wget"; then
    # Emulate curl with wget
    ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
--- a/test/fast/Unit
+++ b/test/fast/Unit
--- a/test/fast/Unit
+++ b/test/fast/Unit
--- a/test/fast/Unit
+++ b/test/fast/Unit
--- a/test/fast/Unit
+++ b/test/fast/Unit
--- a/tests/nvm_download
+++ b/tests/nvm_download
@ -25,7 +25,4 @@ NVM_AUTH_HEADER="Bearer test-token" nvm_download "http://127.0.0.1/bearer" > /de
 nvm_download "http://127.0.0.1/bearer" > /dev/null && die 'nvm_download with no auth header should not send the header and should fail'
 docker stop httpbin && docker rm httpbin

-# ensure quoted extra args remain quoted
-nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/install.sh" -o "; die quoted-command-not-quoted" || die 'command failed'
-
 cleanup
--- a/tests/nvm_install_binary_extract
+++ b/tests/nvm_install_binary_extract
--- a/tests/nvm_install_no_progress_bar
+++ b/tests/nvm_install_no_progress_bar
--- a/tests/nvm_is_version_installed
+++ b/tests/nvm_is_version_installed
--- a/tests/nvm_write_nvmrc
+++ b/tests/nvm_write_nvmrc
--- a/test/fast/nvm
+++ b/test/fast/nvm
--- a/test/install_script/nvm_download
+++ b/test/install_script/nvm_download
@ -12,7 +12,7 @@ nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/install.sh" >/de

 # nvm_download should fail to download wrong_install.sh
 if nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/wrong_install.sh" &>/dev/null; then
-  die "nvm_download should fail to download nonexistent file"
+  die "nvm_download should fail to download no existing file"
 fi

 cleanup
--- a/test/installation_iojs/install
+++ b/test/installation_iojs/install
--- a/test/installation_iojs/install
+++ b/test/installation_iojs/install
--- a/test/installation_node/install
+++ b/test/installation_node/install
--- a/test/slow/nvm
+++ b/test/slow/nvm
--- a/reinstall-packages/test-npmlink/package.json
+++ b/reinstall-packages/test-npmlink/package.json
--- a/test/slow/nvm
+++ b/test/slow/nvm