Merge 6375e4ed79dc584a8174e5816d68a1c31b6d9b27 into ff1257e8e3059ae01928c4261a41de2260bcd968

[Refactor] nvm_has_colors: also check the env var
2025-08-17 02:53:43 +00:00 · 2024-07-29 11:20:04 +09:00 · 2024-07-28 18:01:14 -07:00
1 changed files with 3 additions and 3 deletions
--- a/nvm.sh
+++ b/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() {
@ -1102,7 +1102,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"
@ -1840,7 +1840,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
Author	SHA1	Message	Date
Jahir Raihan Joy	12c5000257	Merge 6375e4ed79dc584a8174e5816d68a1c31b6d9b27 into ff1257e8e3059ae01928c4261a41de2260bcd968	2024-07-29 11:20:04 +09:00
Jordan Harband	ff1257e8e3	[Refactor] `nvm_has_colors`: also check the env var	2024-07-28 18:01:14 -07:00