Merge 5f7d419458beeecc1898a0181c318cffe2601dc8 into 4beab63631764fc381a0e56273faf8d43b8f9509

[Fix] declare an unbound variable
Fixes #3402
2025-08-19 12:03:43 +00:00 · 2024-08-07 09:39:53 +00:00 · 2024-08-07 17:38:37 +12:00 · 2023-08-27 19:10:32 +12:00 · 2023-08-27 18:49:27 +12:00
1 changed files with 13 additions and 5 deletions
--- a/nvm.sh
+++ b/nvm.sh
@ -503,9 +503,9 @@ $(nvm_wrap_with_color_code 'y' "${warn_text}")"
 }

 nvm_process_nvmrc() {
-  local NVMRC_PATH="$1"
+  local NVMRC_PATH
+  NVMRC_PATH="$1"
  local lines
-  local unpaired_line

  lines=$(command sed 's/#.*//' "$NVMRC_PATH" | command sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | nvm_grep -v '^$')

@ -515,8 +515,12 @@ nvm_process_nvmrc() {
  fi

  # Initialize key-value storage
-  local keys=''
-  local values=''
+  local keys
+  keys=''
+  local values
+  values=''
+  local unpaired_line
+  unpaired_line=''

  while IFS= read -r line; do
    if [ -z "${line}" ]; then
@ -4488,7 +4492,11 @@ nvm_supports_xz() {
  if [ "_${NVM_OS}" = '_darwin' ]; then
    local MACOS_VERSION
    MACOS_VERSION="$(sw_vers -productVersion)"
-    if nvm_version_greater "10.9.0" "${MACOS_VERSION}"; then
+    if tar --version | command grep -q GNU && ! command which xz >/dev/null 2>&1; then
+      # On macOS with GNU tar in use, and no xv on the path, xv-compressed
+      # tarballs aren't supported
+      return 1
+    elif nvm_version_greater "10.9.0" "${MACOS_VERSION}"; then
      # macOS 10.8 and earlier doesn't support extracting xz-compressed tarballs with tar
      return 1
    fi
Author	SHA1	Message	Date
tim-mit	7c9651a9a6	Merge 5f7d419458beeecc1898a0181c318cffe2601dc8 into 4beab63631764fc381a0e56273faf8d43b8f9509	2024-08-07 09:39:53 +00:00
Jordan Harband	4beab63631	[Fix] declare an unbound variable Fixes #3402	2024-08-07 17:38:37 +12:00
tim-mit	5f7d419458	Merge branch 'master' into issue3034	2023-08-27 19:10:32 +12:00
Tim Toomey	b42c165667	[Fix] gracefully handle GNU tar on MacOS during `nvm install` GNU tar doesn't support using the -J flag required to unpack xz-compressed tarballs when xv isn't installed. Check for this scenario and fallback to using gzip-compressed tarballs. Fixes #3034	2023-08-27 18:49:27 +12:00