commit 015623ee6d1827f83d3e1ff8d37fcf9da735fa73
author Jordan Harband <ljharb@gmail.com> Wed Jan 20 13:47:17 2021 -0800
committer GitHub <noreply@github.com> Wed Jan 20 13:47:17 2021 -0800
tree 0b3811489d3a3acc4c1a78ac8c05d51173d55536
parent 502089ae308c3a771e09d233f8221ea17a0647dd
parent 31c5c5c45a2e646bb09883af7b2c11b1abc9c561

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

Merge pull request #2365 from hosamaly/patch-1

nvm.sh

diff --git a/nvm.sh b/nvm.sh
index 9635062..8d57cae 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -785,22 +785,22 @@
 
 nvm_print_color_code() {
   case "${1-}" in
-    r) nvm_echo '0;31m';;
-    R) nvm_echo '1;31m';;
-    g) nvm_echo '0;32m';;
-    G) nvm_echo '1;32m';;
-    b) nvm_echo '0;34m';;
-    B) nvm_echo '1;34m';;
-    c) nvm_echo '0;36m';;
-    C) nvm_echo '1;36m';;
-    m) nvm_echo '0;35m';;
-    M) nvm_echo '1;35m';;
-    y) nvm_echo '0;33m';;
-    Y) nvm_echo '1;33m';;
-    k) nvm_echo '0;30m';;
-    K) nvm_echo '1;30m';;
-    e) nvm_echo '0;37m';;
-    W) nvm_echo '1;37m';;
+    'r') nvm_echo '0;31m';;
+    'R') nvm_echo '1;31m';;
+    'g') nvm_echo '0;32m';;
+    'G') nvm_echo '1;32m';;
+    'b') nvm_echo '0;34m';;
+    'B') nvm_echo '1;34m';;
+    'c') nvm_echo '0;36m';;
+    'C') nvm_echo '1;36m';;
+    'm') nvm_echo '0;35m';;
+    'M') nvm_echo '1;35m';;
+    'y') nvm_echo '0;33m';;
+    'Y') nvm_echo '1;33m';;
+    'k') nvm_echo '0;30m';;
+    'K') nvm_echo '1;30m';;
+    'e') nvm_echo '0;37m';;
+    'W') nvm_echo '1;37m';;
     *) nvm_err 'Invalid color code';
         return 1
     ;;

test/sourcing/Sourcing nvm.sh global alias bug

diff --git a/test/sourcing/Sourcing nvm.sh global alias bug b/test/sourcing/Sourcing nvm.sh global alias bug
new file mode 100755
index 0000000..181a2a6
--- /dev/null
+++ b/test/sourcing/Sourcing nvm.sh global alias bug
@@ -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