diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-10-08 11:04:31 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-10-08 11:04:31 -0600 |
| commit | 1774c426de3c4845e2d606c813c37067b8cf78d7 (patch) | |
| tree | 872a7bbcaa79cf0b1c19d2687090ee6eb8e205fb /plugins/nvm/nvm.plugin.zsh | |
| parent | 2b3d602644a13aa97391f22ecfc249b6bc58dd49 (diff) | |
| parent | 27857e66d0dab0bd05790307dfe5388f3cb2c51a (diff) | |
| download | zsh-1774c426de3c4845e2d606c813c37067b8cf78d7.tar.gz zsh-1774c426de3c4845e2d606c813c37067b8cf78d7.tar.bz2 zsh-1774c426de3c4845e2d606c813c37067b8cf78d7.zip | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'plugins/nvm/nvm.plugin.zsh')
| -rw-r--r-- | plugins/nvm/nvm.plugin.zsh | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index 4bab8e9d7..2264a2420 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -1,8 +1,23 @@ # Set NVM_DIR if it isn't already defined [[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm" -# Try to load nvm only if command not already available -if ! type "nvm" &> /dev/null; then - # Load nvm if it exists - [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh" +# Don't try to load nvm if command already available +type "nvm" &> /dev/null && return + +# Load nvm if it exists in $NVM_DIR +if [[ -f "$NVM_DIR/nvm.sh" ]]; then + source "$NVM_DIR/nvm.sh" + return +fi + +# Otherwise try to load nvm installed via Homebrew + +# User can set this if they have an unusual Homebrew setup +NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}" +# Load nvm from Homebrew location if it exists +[[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" +# Load nvm bash completion from Homebrew if it exists +if [[ -f "$NVM_HOMEBREW/etc/bash_completion.d/nvm" ]]; then + autoload -U +X bashcompinit && bashcompinit + source "$NVM_HOMEBREW/etc/bash_completion.d/nvm" fi |