Skip to content

Commit d743b62

Browse files
authored
Merge pull request #2162 from brianphillips/patch-3
2 parents a2a6155 + c5fdefe commit d743b62

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

plugins/available/nvm.plugin.bash

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,18 @@ cite about-plugin
99
about-plugin 'node version manager configuration'
1010

1111
export NVM_DIR="${NVM_DIR:-$HOME/.nvm}"
12+
13+
# first check if NVM is managed by brew
14+
NVM_BREW_PREFIX=""
15+
if _bash_it_homebrew_check
16+
then
17+
NVM_BREW_PREFIX=$(brew --prefix nvm 2>/dev/null)
18+
fi
19+
1220
# This loads nvm
13-
if _bash_it_homebrew_check && [[ -s "${BASH_IT_HOMEBREW_PREFIX}/nvm.sh" ]]
21+
if [[ -n "$NVM_BREW_PREFIX" && -s "${NVM_BREW_PREFIX}/nvm.sh" ]]
1422
then
15-
source "${BASH_IT_HOMEBREW_PREFIX}/nvm.sh"
23+
source "${NVM_BREW_PREFIX}/nvm.sh"
1624
else
1725
[[ -s "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
1826
fi

0 commit comments

Comments
 (0)