nvm plugin improvements (#5265)
* Export $NVM_DIR if it doesn't exist and use it when looking for nvm
* Use $NVM_DIR when looking for nvm for completion
* Use $NVM_DIR when looking for nvm in nvm_prompt_info
Diff
1diff --git a/lib/nvm.zsh b/lib/nvm.zsh
2index 61d997fc07806ccb114df0895a8c6dc4c96866d8..4a8b6811e9c64730a71b7ad42ec2cfa5c88e99e1 100644
3--- a/lib/nvm.zsh
4+++ b/lib/nvm.zsh
5@@ -1,6 +1,6 @@
6 # get the node.js version
7 function nvm_prompt_info() {
8- [ -f "$HOME/.nvm/nvm.sh" ] || return
9+ [[ -f "$NVM_DIR/nvm.sh" ]] || return
10 local nvm_prompt
11 nvm_prompt=$(node -v 2>/dev/null)
12 [[ "${nvm_prompt}x" == "x" ]] && return
13diff --git a/plugins/nvm/_nvm b/plugins/nvm/_nvm
14index a95c9e3753e5eb398f0ec271069d86db6a34cf81..1414dcbb1782a9f52d8cda6b7d0cff0ab9d57ab1 100644
15--- a/plugins/nvm/_nvm
16+++ b/plugins/nvm/_nvm
17@@ -1,7 +1,7 @@
18 #compdef nvm
19 #autoload
2021-[[ -s ~/.nvm/nvm.sh ]] || return 0
22+[[ -f "$NVM_DIR/nvm.sh" ]] || return 0
2324 local -a _1st_arguments
25 _1st_arguments=(
26diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
27index 9709719fefb42fea444c8dc62fe13a5ced58bf72..9dde3a266ae18237c8cbabe3e7af862c6450f6af 100644
28--- a/plugins/nvm/nvm.plugin.zsh
29+++ b/plugins/nvm/nvm.plugin.zsh
30@@ -1,3 +1,5 @@
31-# The addition 'nvm install' attempts in ~/.profile
32+# Set NVM_DIR if it isn't already defined
33+[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
3435-[[ -s ~/.nvm/nvm.sh ]] && . ~/.nvm/nvm.sh
36+# Load nvm if it exists
37+[[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"