diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-10-09 16:35:47 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-10-09 17:21:03 +0200 |
| commit | a33c0cdb46badcc1df9a37da015a82f7f7b0a7e5 (patch) | |
| tree | 8e6b9af8d18b6be4a683067cdddc0ea6280793bc /plugins/nvm/nvm.plugin.zsh | |
| parent | 3e973080037ae68ac25a08545e7cdc60ba128900 (diff) | |
| download | zsh-a33c0cdb46badcc1df9a37da015a82f7f7b0a7e5.tar.gz zsh-a33c0cdb46badcc1df9a37da015a82f7f7b0a7e5.tar.bz2 zsh-a33c0cdb46badcc1df9a37da015a82f7f7b0a7e5.zip | |
nvm: only lazy-load nvm if the NVM_LAZY setting is set
Diffstat (limited to 'plugins/nvm/nvm.plugin.zsh')
| -rw-r--r-- | plugins/nvm/nvm.plugin.zsh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index 640f1d45c..164be5907 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -12,21 +12,23 @@ 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" --no-use + source "$NVM_DIR/nvm.sh" ${NVM_LAZY+"--no-use"} else # 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" --no-use + [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"} fi # Call nvm when first using node, npm or yarn -function node npm yarn { - unfunction node npm yarn - nvm use default - command "$0" "$@" -} +if (( $+NVM_LAZY )); then + function node npm yarn { + unfunction node npm yarn + nvm use default + command "$0" "$@" + } +fi # Load nvm bash completion for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do |