Use node to get version information if nvm is not present

Fixes #132
This commit is contained in:
Michael Robinson
2016-04-20 21:35:11 +12:00
committed by Caio Gondim
parent d5b375063e
commit 5ca3596f58
2 changed files with 7 additions and 5 deletions

View File

@@ -10,7 +10,7 @@ simplicity, showing information only when it's relevant.
It currently shows: It currently shows:
- Current Python virtualenv; when using Pyenv and no active virtualenv shows the current Python version the shell uses - Current Python virtualenv; when using Pyenv and no active virtualenv shows the current Python version the shell uses
- Current Ruby version using chruby; version and gemset when on RVM or Rbenv - Current Ruby version using chruby; version and gemset when on RVM or Rbenv
- Current Node.js version, through NVM - Current Node.js version, through NVM (if present) or Node.js
- Current Perl version using plenv - Current Perl version using plenv
- Git status - Git status
- Timestamp - Timestamp

View File

@@ -539,11 +539,13 @@ prompt_nvm() {
return return
fi fi
$(type nvm >/dev/null 2>&1) || return
local nvm_prompt local nvm_prompt
nvm_prompt=$(nvm current 2>/dev/null) if [[ $(type nvm >/dev/null 2>&1) ]]; then
[[ "${nvm_prompt}x" == "x" ]] && return nvm_prompt=$(nvm current 2>/dev/null)
[[ "${nvm_prompt}x" == "x" ]] && return
else
nvm_prompt="$(node --version)"
fi
nvm_prompt=${nvm_prompt} nvm_prompt=${nvm_prompt}
prompt_segment $BULLETTRAIN_NVM_BG $BULLETTRAIN_NVM_FG $BULLETTRAIN_NVM_PREFIX$nvm_prompt prompt_segment $BULLETTRAIN_NVM_BG $BULLETTRAIN_NVM_FG $BULLETTRAIN_NVM_PREFIX$nvm_prompt
} }