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

nvm plugin improvements (#5265)
a7de0fab · Luke Childs · Marc Cornellà · 7654b16b · a7de0fab · a7de0fab
Commit a7de0fab authored Aug 07, 2016 by Luke Childs Committed by Marc Cornellà Aug 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

nvm.zsh lib/nvm.zsh +1 -1

_nvm plugins/nvm/_nvm +1 -1

nvm.plugin.zsh plugins/nvm/nvm.plugin.zsh +4 -2

No files found.
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
 # get the node.js version
 function nvm_prompt_info() {
-  [ -f "$HOME/.nvm/nvm.sh" ] || return
+  [[ -f "$NVM_DIR/nvm.sh" ]] || return
  local nvm_prompt
  nvm_prompt=$(node -v 2>/dev/null)
  [[ "${nvm_prompt}x" == "x" ]] && return

--- a/plugins/nvm/_nvm
+++ b/plugins/nvm/_nvm
 #compdef nvm
 #autoload

-[[ -s ~/.nvm/nvm.sh ]] || return 0
+[[ -f "$NVM_DIR/nvm.sh" ]] || return 0

 local -a _1st_arguments
 _1st_arguments=(

--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
-# The addition 'nvm install' attempts in ~/.profile
+# Set NVM_DIR if it isn't already defined
+[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"

-[[ -s ~/.nvm/nvm.sh ]] && . ~/.nvm/nvm.sh
+# Load nvm if it exists
+[[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"