From 79237542499bba6bd326e7f44ed85699d9286a6b Mon Sep 17 00:00:00 2001 From: isquariel Date: Wed, 4 Dec 2013 21:43:31 +0400 Subject: [PATCH 1/2] Changed determination nvm in system --- lib/nvm.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/nvm.zsh b/lib/nvm.zsh index 61d997fc0..5bdd023b3 100644 --- a/lib/nvm.zsh +++ b/lib/nvm.zsh @@ -1,6 +1,9 @@ # get the node.js version function nvm_prompt_info() { - [ -f "$HOME/.nvm/nvm.sh" ] || return + if [[ "$(command -v nvm)" != "nvm" || -z $(echo $PATH | grep "$HOME/.nvm") ]]; + then return + fi + local nvm_prompt nvm_prompt=$(node -v 2>/dev/null) [[ "${nvm_prompt}x" == "x" ]] && return From 9be4ccea7fd0c362563fbb635e4c43b2caec36e9 Mon Sep 17 00:00:00 2001 From: isqua Date: Fri, 16 Jan 2015 14:59:05 +0300 Subject: [PATCH 2/2] Add nvm autocomplete to plugin --- plugins/nvm/nvm.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index 9709719fe..0ec787e2b 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -1,3 +1,4 @@ # The addition 'nvm install' attempts in ~/.profile [[ -s ~/.nvm/nvm.sh ]] && . ~/.nvm/nvm.sh +[[ -r $NVM_DIR/bash_completion ]] && . $NVM_DIR/bash_completion