Merge c1064550872bfc16afe02ec6edeb73ff3847a3da into ff1257e8e3059ae01928c4261a41de2260bcd968

See db19450caa

Fixes #3382

nvm.sh

@@ -83,7 +83,7 @@ nvm_has_colors() {
   if nvm_has tput; then
     NVM_NUM_COLORS="$(tput -T "${TERM:-vt100}" colors)"
   fi
-  [ "${NVM_NUM_COLORS:--1}" -ge 8 ]
+  [ "${NVM_NUM_COLORS:--1}" -ge 8 ] && [ "${NVM_NO_COLORS-}" != '--no-colors' ]
 }
 
 nvm_curl_libz_support() {
@@ -1094,7 +1094,7 @@ nvm_print_formatted_alias() {
   fi
   local ARROW
   ARROW='->'
-  if [ -z "${NVM_NO_COLORS}" ] && nvm_has_colors; then
+  if nvm_has_colors; then
     ARROW='\033[0;90m->\033[0m'
     if [ "_${DEFAULT}" = '_true' ]; then
       NEWLINE=" \033[${DEFAULT_COLOR}(default)\033[0m\n"
@@ -1832,7 +1832,7 @@ nvm_print_versions() {
   DEFAULT_COLOR=$(nvm_get_colors 5)
   LTS_COLOR=$(nvm_get_colors 6)
 
-  if [ -z "${NVM_NO_COLORS-}" ] && nvm_has_colors; then
+  if nvm_has_colors; then
     NVM_HAS_COLORS=1
   fi
 
@@ -4436,37 +4436,23 @@ nvm() {
 }
 
 nvm_get_default_packages() {
-  local NVM_DEFAULT_PACKAGE_FILE="${NVM_DIR}/default-packages"
+  local NVM_DEFAULT_PACKAGE_FILE
+  NVM_DEFAULT_PACKAGE_FILE="${NVM_DIR}/default-packages"
   if [ -f "${NVM_DEFAULT_PACKAGE_FILE}" ]; then
-    local DEFAULT_PACKAGES
+    command awk -v filename="${NVM_DEFAULT_PACKAGE_FILE}" '
-    DEFAULT_PACKAGES=''
+      /^[[:space:]]*#/ { next }                     # Skip lines that begin with #
-
+      /^[[:space:]]*$/ { next }                     # Skip empty lines
-    # Read lines from $NVM_DIR/default-packages
+      /[[:space:]]/ && !/^[[:space:]]*#/ {
-    local line
+        print "Only one package per line is allowed in `" filename "`. Please remove any lines with multiple space-separated values." > "/dev/stderr"
-    # ensure a trailing newline
+        err = 1
-    WORK=$(mktemp -d) || exit $?
+        exit 1
-    # shellcheck disable=SC2064
+      }
-    trap "command rm -rf '$WORK'" EXIT
+      {
-    # shellcheck disable=SC1003
+        if (NR > 1 && !prev_space) printf " "
-    sed -e '$a\' "${NVM_DEFAULT_PACKAGE_FILE}" > "${WORK}/default-packages"
+        printf "%s", $0
-    while IFS=' ' read -r line; do
+        prev_space = 0
-      # Skip empty lines.
+      }
-      [ -n "${line-}" ] || continue
+    ' "${NVM_DEFAULT_PACKAGE_FILE}"
-
-      # Skip comment lines that begin with `#`.
-      [ "$(nvm_echo "${line}" | command cut -c1)" != "#" ] || continue
-
-      # Fail on lines that have multiple space-separated words
-      case $line in
-        *\ *)
-          nvm_err "Only one package per line is allowed in the ${NVM_DIR}/default-packages file. Please remove any lines with multiple space-separated values."
-          return 1
-        ;;
-      esac
-
-      DEFAULT_PACKAGES="${DEFAULT_PACKAGES}${line} "
-    done < "${WORK}/default-packages"
-    echo "${DEFAULT_PACKAGES}" | command xargs
   fi
 }
 

test/fast/Unit tests/nvm_get_default_packages

@@ -74,7 +74,7 @@ rimraf
 EOF
 
 DEFAULT_PKGS="$(nvm_get_default_packages 2>&1 >/dev/null)"
-EXPECTED_PKGS="Only one package per line is allowed in the $FILE file. Please remove any lines with multiple space-separated values."
+EXPECTED_PKGS="Only one package per line is allowed in \`${FILE}\`. Please remove any lines with multiple space-separated values."
 [ "${DEFAULT_PKGS}" = "${EXPECTED_PKGS}" ] || die "4: expected default packages >${EXPECTED_PKGS}<; got >${DEFAULT_PKGS}<"
 
 cleanup