Skip to content

Commit

Permalink
Don’t restrict colors to TTYs.
Browse files Browse the repository at this point in the history
This restriction prevents subcommands from producing colors and passing them up the tree to the actual TTY.
  • Loading branch information
ljharb committed May 9, 2016
1 parent 0880539 commit eeaddf9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 1 addition & 3 deletions nvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ nvm_is_alias() {

nvm_has_colors() {
local NVM_COLORS
if test -t 1; then
NVM_COLORS="$(tput -T "${TERM:-vt100}" colors)"
fi
NVM_COLORS="$(tput -T "${TERM:-vt100}" colors)"
[ "${NVM_COLORS:--1}" -ge 8 ]
}

Expand Down
4 changes: 3 additions & 1 deletion test/fast/Aliases/nvm_ensure_default_set
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh

. ../../common.sh

die () { echo $@ ; exit 1; }

. ../../../nvm.sh
Expand All @@ -14,5 +16,5 @@ OUTPUT="$(nvm_ensure_default_set 0.2)"
EXPECTED_OUTPUT="Creating default alias: default -> 0.2 (-> iojs-v0.2.10)"
EXIT_CODE="$?"

[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set 0.2' did not output '$EXPECTED_OUTPUT', got '$OUTPUT'"
[ "_$(echo "$OUTPUT" | strip_colors)" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set 0.2' did not output '$EXPECTED_OUTPUT', got '$OUTPUT'"
[ "_$EXIT_CODE" = "_0" ] || die "'nvm_ensure_default_set 0.2' did not exit with 0, got $EXIT_CODE"
4 changes: 3 additions & 1 deletion test/fast/Unit tests/nvm_ensure_default_set
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/sh

. ../../common.sh

die () { echo $@ ; exit 1; }

. ../../../nvm.sh

EXPECTED_OUTPUT="nvm_ensure_default_set: a version is required"
OUTPUT="$(nvm_ensure_default_set 2>&1 >/dev/null)"
EXIT_CODE="$?"
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set' did not output "$EXPECTED_OUTPUT", got "$OUTPUT""
[ "_$(echo "$OUTPUT" | strip_colors)" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set' did not output "$EXPECTED_OUTPUT", got "$OUTPUT""
[ "_$EXIT_CODE" = "_1" ] || die "'nvm_ensure_default_set' did not exit with 1, got "$EXIT_CODE""

# see test/fast/Aliases for remaining nvm_ensure_default_set tests

0 comments on commit eeaddf9

Please sign in to comment.