Merge pull request #2162 from brianphillips/patch-3

Bash-it · Nov 6, 2024 · d743b62 · d743b62
2 parents a2a6155 + c5fdefe
commit d743b62
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/plugins/available/nvm.plugin.bash b/plugins/available/nvm.plugin.bash
@@ -9,10 +9,18 @@ cite about-plugin
 about-plugin 'node version manager configuration'
 
 export NVM_DIR="${NVM_DIR:-$HOME/.nvm}"
+
+# first check if NVM is managed by brew
+NVM_BREW_PREFIX=""
+if _bash_it_homebrew_check
+then
+  NVM_BREW_PREFIX=$(brew --prefix nvm 2>/dev/null)
+fi
+
 # This loads nvm
-if _bash_it_homebrew_check && [[ -s "${BASH_IT_HOMEBREW_PREFIX}/nvm.sh" ]]
+if [[ -n "$NVM_BREW_PREFIX" && -s "${NVM_BREW_PREFIX}/nvm.sh" ]]
 then
-  source "${BASH_IT_HOMEBREW_PREFIX}/nvm.sh"
+  source "${NVM_BREW_PREFIX}/nvm.sh"
 else
   [[ -s "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
 fi