Merge 5f7d419458 into 759f70f196

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

nvm.sh

@@ -136,15 +136,17 @@ nvm_download() {
     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 /' \
-                            -e 's/--compressed //' \
-                            -e 's/--fail //' \
-                            -e 's/-L //' \
-                            -e 's/-I /--server-response /' \
-                            -e 's/-s /-q /' \
-                            -e 's/-sS /-nv /' \
-                            -e 's/-o /-O /' \
-                            -e 's/-C - /-c /')
+    ARGS=$(nvm_echo "$@" | command sed "
+      s/--progress-bar /--progress=bar /
+      s/--compressed //
+      s/--fail //
+      s/-L //
+      s/-I /--server-response /
+      s/-s /-q /
+      s/-sS /-nv /
+      s/-o /-O /
+      s/-C - /-c /
+    ")
 
     if [ -n "${NVM_AUTH_HEADER:-}" ]; then
       ARGS="${ARGS} --header \"${NVM_AUTH_HEADER}\""
@@ -1413,11 +1415,11 @@ nvm_add_iojs_prefix() {
 nvm_strip_iojs_prefix() {
   local NVM_IOJS_PREFIX
   NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-  if [ "${1-}" = "${NVM_IOJS_PREFIX}" ]; then
-    nvm_echo
-  else
-    nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}"
-  fi
+
+  case "${1-}" in
+    "${NVM_IOJS_PREFIX}") nvm_echo ;;
+    *) nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}" ;;
+  esac
 }
 
 nvm_ls() {
@@ -1549,12 +1551,15 @@ nvm_ls() {
   fi
 
   if [ "${NVM_ADD_SYSTEM-}" = true ]; then
-    if [ -z "${PATTERN}" ] || [ "${PATTERN}" = 'v' ]; then
-      VERSIONS="${VERSIONS}
+    case "${PATTERN}" in
+      '' | v)
+        VERSIONS="${VERSIONS}
 system"
-    elif [ "${PATTERN}" = 'system' ]; then
-      VERSIONS="system"
-    fi
+      ;;
+      system)
+        VERSIONS="system"
+      ;;
+    esac
   fi
 
   if [ -z "${VERSIONS}" ]; then
@@ -1688,7 +1693,7 @@ EOF
     LTS="${LTS#lts/}"
   fi
 
-  VERSIONS="$({ command awk -v lts="${LTS-}" '{
+  VERSIONS="$( { command awk -v lts="${LTS-}" '{
         if (!$1) { next }
         if (lts && $10 ~ /^\-?$/) { next }
         if (lts && lts != "*" && tolower($10) !~ tolower(lts)) { next }
@@ -2732,7 +2737,7 @@ nvm_npm_global_modules() {
   local NPMLIST
   local VERSION
   VERSION="$1"
-  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed 1,1d | nvm_grep -v 'UNMET PEER DEPENDENCY')
+  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed -e '1d' -e '/UNMET PEER DEPENDENCY/d')
 
   local INSTALLS
   INSTALLS=$(nvm_echo "${NPMLIST}" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*@[^ ]*\).*/\1/' -e '/^npm@[^ ]*.*$/ d' | command xargs)
@@ -4551,7 +4556,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