nvm: speed-up nvm loading with --no-use

Closes #7138

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
This commit is contained in:
Keith Yao 2018-09-17 11:14:29 +02:00 committed by Marc Cornellà
parent d6f3630932
commit 3e97308003

View file

@ -12,15 +12,22 @@ which nvm &> /dev/null && return
if [[ -f "$NVM_DIR/nvm.sh" ]]; then if [[ -f "$NVM_DIR/nvm.sh" ]]; then
# Load nvm if it exists in $NVM_DIR # Load nvm if it exists in $NVM_DIR
source "$NVM_DIR/nvm.sh" source "$NVM_DIR/nvm.sh" --no-use
else else
# Otherwise try to load nvm installed via Homebrew # Otherwise try to load nvm installed via Homebrew
# User can set this if they have an unusual Homebrew setup # User can set this if they have an unusual Homebrew setup
NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}" NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
# Load nvm from Homebrew location if it exists # Load nvm from Homebrew location if it exists
[[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" --no-use
fi fi
# Call nvm when first using node, npm or yarn
function node npm yarn {
unfunction node npm yarn
nvm use default
command "$0" "$@"
}
# Load nvm bash completion # Load nvm bash completion
for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
if [[ -f "$nvm_completion" ]]; then if [[ -f "$nvm_completion" ]]; then