diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2022-05-23 12:25:11 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2022-05-23 12:25:11 -0600 |
| commit | 901674e84756d64024cdc70f9590c3557c6d92d6 (patch) | |
| tree | d3b90c50a39f4a7f220b0a19718dc305fe1c7af4 /plugins/nvm | |
| parent | 2023d3ab658fe8ed4dd4ca33cd5974ab8f0ad945 (diff) | |
| parent | 39b600e9e564db3dec265fcf2e3db4b5568dd93a (diff) | |
| download | zsh-901674e84756d64024cdc70f9590c3557c6d92d6.tar.gz zsh-901674e84756d64024cdc70f9590c3557c6d92d6.tar.bz2 zsh-901674e84756d64024cdc70f9590c3557c6d92d6.zip | |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'plugins/nvm')
| -rw-r--r-- | plugins/nvm/nvm.plugin.zsh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index 3ef8cc1d8..630854a71 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -8,22 +8,24 @@ if [[ -z "$NVM_DIR" ]]; then fi # Don't try to load nvm if command already available -which nvm &> /dev/null && return +# Note: nvm is a function so we need to use `which` +! which nvm &>/dev/null || return if [[ -f "$NVM_DIR/nvm.sh" ]]; then # Load nvm if it exists in $NVM_DIR source "$NVM_DIR/nvm.sh" ${NVM_LAZY+"--no-use"} -else +elif (( $+commands[brew] )); then # 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}" + NVM_HOMEBREW="${NVM_HOMEBREW:-${HOMEBREW_PREFIX:-$(brew --prefix)}/opt/nvm}" # Load nvm from Homebrew location if it exists if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"} else - # Exit the plugin if we couldn't find nvm return fi +else + return fi # Call nvm when first using node, npm or yarn |