273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] avoid parse error with common omz global aliases, in `nvm_print_color_code` 

Merge pull request #2365 from hosamaly/patch-1
Jordan Harband 2021-01-20 13:47:17 -08:00 committed by GitHub
parent 502089ae30 31c5c5c45a
commit 015623ee6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nvm.sh
View File

@ -785,22 +785,22 @@ nvm_get_colors() {
nvm_print_color_code() { nvm_print_color_code() {
case "${1-}" in case "${1-}" in
r) nvm_echo '0;31m';; 'r') nvm_echo '0;31m';;
R) nvm_echo '1;31m';; 'R') nvm_echo '1;31m';;
g) nvm_echo '0;32m';; 'g') nvm_echo '0;32m';;
G) nvm_echo '1;32m';; 'G') nvm_echo '1;32m';;
b) nvm_echo '0;34m';; 'b') nvm_echo '0;34m';;
B) nvm_echo '1;34m';; 'B') nvm_echo '1;34m';;
c) nvm_echo '0;36m';; 'c') nvm_echo '0;36m';;
C) nvm_echo '1;36m';; 'C') nvm_echo '1;36m';;
m) nvm_echo '0;35m';; 'm') nvm_echo '0;35m';;
M) nvm_echo '1;35m';; 'M') nvm_echo '1;35m';;
y) nvm_echo '0;33m';; 'y') nvm_echo '0;33m';;
Y) nvm_echo '1;33m';; 'Y') nvm_echo '1;33m';;
k) nvm_echo '0;30m';; 'k') nvm_echo '0;30m';;
K) nvm_echo '1;30m';; 'K') nvm_echo '1;30m';;
e) nvm_echo '0;37m';; 'e') nvm_echo '0;37m';;
W) nvm_echo '1;37m';; 'W') nvm_echo '1;37m';;
*) nvm_err 'Invalid color code'; *) nvm_err 'Invalid color code';
return 1 return 1
;; ;;

30
test/sourcing/Sourcing nvm.sh global alias bug 100755
View File

@ -0,0 +1,30 @@
#!/bin/sh
die () { echo "$@" ; exit 1; }
if [ -n "${ZSH_VERSION-}" ]; then
# these are set by omz: https://github.com/ohmyzsh/ohmyzsh/tree/1ac40cd4456230f09bf0258b173304929d118992/plugins/common-aliases
alias -g R='| less -S'
alias -g G='| less -S'
# these are set by yadr: https://github.com/skwp/dotfiles/blob/5c487de9b81cd4265ecc9df74477e410ffbda6a1/zsh/zsh-aliases.zsh
alias -g C='| wc -l'
alias -g H='| head'
alias -g L="| less"
alias -g N="| /dev/null"
alias -g S='| sort'
alias -g G='| grep'
fi
OUTPUT=$(\. ../../nvm.sh || echo 'sourcing returned nonzero exit code')
UNEXPECTED_OUTPUT="sourcing returned nonzero exit code"
[ "_$OUTPUT" != "_$UNEXPECTED_OUTPUT" ] || die "Sourcing nvm.sh should not fail"
if [ -n "${ZSH_VERSION-}" ]; then
unalias \R
unalias \G
unalias \C
unalias \H
unalias \L
unalias \N
unalias \S
fi