fixup

[Fix] nvm_download: ensure all args are quoted
[Fix] --save: avoid a conflict with set -e
2025-08-20 04:23:43 +00:00 · 2024-08-20 22:47:56 -07:00 · 2024-08-20 22:33:38 -07:00 · 2024-08-10 15:52:24 +12:00 · 2024-08-20 16:21:45 -07:00
2 changed files with 8 additions and 1 deletions
--- a/nvm.sh
+++ b/nvm.sh
@ -128,7 +128,12 @@ nvm_download() {
    if nvm_curl_use_compression; then
      CURL_COMPRESSED_FLAG="--compressed"
    fi
-    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
+    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}"
  elif nvm_has "wget"; then
    # Emulate curl with wget
    ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
--- a/test/install_script/nvm_download
+++ b/test/install_script/nvm_download
@ -15,4 +15,6 @@ if nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/wrong_install
  die "nvm_download should fail to download no existing file"
 fi

+nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/install.sh" -o "; die quoted-command-not-quoted"
+
 cleanup
Author	SHA1	Message	Date
Jordan Harband	c80b89720f	fixup	2024-08-20 22:47:56 -07:00
Jordan Harband	4792d122b1	[Fix] `nvm_download`: ensure all args are quoted	2024-08-20 22:33:38 -07:00
Jordan Harband	c31a867c46	[Fix] `--save`: avoid a conflict with `set -e` Fixes #3405.	2024-08-10 15:52:24 +12:00
Jordan Harband	a8c418558a	[Refactor] `--save`: clean up some usage	2024-08-20 16:21:45 -07:00