From 5d391f0955c611f418765093cd9c78c35d6bcdc7 Mon Sep 17 00:00:00 2001 From: Blaine Schmeisser Date: Wed, 13 Jul 2016 13:08:16 -0700 Subject: [PATCH] Fix nvm plugin to use also check brew installs. --- plugins/nvm/_nvm | 6 ++++-- plugins/nvm/nvm.plugin.zsh | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/nvm/_nvm b/plugins/nvm/_nvm index a95c9e375..90d7abcc7 100644 --- a/plugins/nvm/_nvm +++ b/plugins/nvm/_nvm @@ -1,7 +1,9 @@ #compdef nvm #autoload -[[ -s ~/.nvm/nvm.sh ]] || return 0 +if ![ -f $HOME/.nvm/nvm.sh ] && ![ $commands[brew] -a -f `brew --prefix`/opt/nvm/nvm.sh ]; then + return 0 +fi local -a _1st_arguments _1st_arguments=( @@ -23,4 +25,4 @@ _arguments -C '*:: :->subcmds' && return 0 if (( CURRENT == 1 )); then _describe -t commands "nvm subcommand" _1st_arguments return -fi \ No newline at end of file +fi diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index 9709719fe..851c02762 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -1,3 +1,7 @@ # The addition 'nvm install' attempts in ~/.profile -[[ -s ~/.nvm/nvm.sh ]] && . ~/.nvm/nvm.sh +if [ -f $HOME/.nvm/nvm.sh ]; then # manual user-local installation + . ~/.nvm/nvm.sh +elif [ $commands[brew] -a -f `brew --prefix`/opt/nvm/nvm.sh ]; then # mac os x with brew + . $(brew --prefix)/opt/nvm/nvm.sh +fi