Merge pull request #1910 from gaelicWizard/brew

lib/helpers: new function to set BASH_IT_HOMEBREW_PREFIX

completion/available/brew.completion.bash

@@ -11,22 +11,20 @@ if [[ "$OSTYPE" != 'darwin'* ]]; then
 fi
 
 # Make sure brew is installed
-_command_exists brew || return 0
+_bash_it_homebrew_check || return 0
 
-BREW_PREFIX=${BREW_PREFIX:-$(brew --prefix)}
-
-if [[ -r "$BREW_PREFIX"/etc/bash_completion.d/brew ]]; then
+if [[ -r "$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d/brew" ]]; then
 	# shellcheck disable=1090
-	source "$BREW_PREFIX"/etc/bash_completion.d/brew
+	source "$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d/brew"
 
-elif [[ -r "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]]; then
+elif [[ -r "$BASH_IT_HOMEBREW_PREFIX/Library/Contributions/brew_bash_completion.sh" ]]; then
 	# shellcheck disable=1090
-	source "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
+	source "$BASH_IT_HOMEBREW_PREFIX/Library/Contributions/brew_bash_completion.sh"
 
-elif [[ -f "$BREW_PREFIX"/completions/bash/brew ]]; then
+elif [[ -f "$BASH_IT_HOMEBREW_PREFIX/completions/bash/brew" ]]; then
 	# For the git-clone based installation, see here for more info:
 	# https://github.com/Bash-it/bash-it/issues/1458
 	# https://docs.brew.sh/Shell-Completion
 	# shellcheck disable=1090
-	source "$BREW_PREFIX"/completions/bash/brew
+	source "$BASH_IT_HOMEBREW_PREFIX/completions/bash/brew"
 fi

completion/available/system.completion.bash

@@ -14,12 +14,11 @@ elif [[ -r /etc/profile.d/bash_completion.sh ]] ; then
   # shellcheck disable=SC1091
   source /etc/profile.d/bash_completion.sh
 
-elif [[ $OSTYPE == 'darwin'* ]] && _command_exists brew ; then
-  BREW_PREFIX=${BREW_PREFIX:-$(brew --prefix)}
-
+elif _bash_it_homebrew_check
+then
   # homebrew/versions/bash-completion2 (required for projects.completion.bash) is installed to this path
-  if [[ -r "$BREW_PREFIX"/etc/bash_completion ]] ; then
+  if [[ -r "$BASH_IT_HOMEBREW_PREFIX"/etc/profile.d/bash_completion.sh ]] ; then
     # shellcheck disable=SC1090
-    source "$BREW_PREFIX"/etc/bash_completion
+    source "$BASH_IT_HOMEBREW_PREFIX"/etc/profile.d/bash_completion.sh
   fi
 fi

lib/helpers.bash

@@ -48,6 +48,22 @@ function _completion_exists ()
   complete -p "$1" &> /dev/null && _log_warning "$msg" ;
 }
 
+function _bash_it_homebrew_check()
+{
+	if _binary_exists 'brew'
+	then # Homebrew is installed
+		if [[ "${BASH_IT_HOMEBREW_PREFIX:-unset}" == 'unset' ]]
+		then # variable isn't set
+			BASH_IT_HOMEBREW_PREFIX="$(brew --prefix)"
+		else
+			true # Variable is set already, don't invoke `brew`.
+		fi
+	else # Homebrew is not installed.
+		BASH_IT_HOMEBREW_PREFIX= # clear variable, if set to anything.
+		false # return failure if brew not installed.
+	fi
+}
+
 function _make_reload_alias() {
   echo "source \${BASH_IT}/scripts/reloader.bash ${1} ${2}"
 }

plugins/available/autojump.plugin.bash

@@ -3,8 +3,8 @@ about-plugin 'Autojump configuration, see https://github.com/wting/autojump for
 
 # Only supports the Homebrew variant, Debian and Arch at the moment.
 # Feel free to provide a PR to support other install locations
-if command -v brew &>/dev/null && [[ -s $(brew --prefix)/etc/profile.d/autojump.sh ]]; then
-  . $(brew --prefix)/etc/profile.d/autojump.sh
+if _bash_it_homebrew_check && [[ -s "${BASH_IT_HOMEBREW_PREFIX}/etc/profile.d/autojump.sh" ]]; then
+  . "${BASH_IT_HOMEBREW_PREFIX}/etc/profile.d/autojump.sh"
 elif command -v dpkg &>/dev/null && dpkg -s autojump &>/dev/null ; then
   . "$(dpkg-query -S autojump.sh | cut -d' ' -f2)"
 elif command -v pacman &>/dev/null && pacman -Q autojump &>/dev/null ; then

plugins/available/nvm.plugin.bash

@@ -9,9 +9,9 @@ about-plugin 'node version manager configuration'
 
 export NVM_DIR=${NVM_DIR:-$HOME/.nvm}
 # This loads nvm
-if command -v brew &>/dev/null && [ -s $(brew --prefix nvm)/nvm.sh ]
+if _bash_it_homebrew_check && [ -s "${BASH_IT_HOMEBREW_PREFIX}/nvm.sh" ]
 then
-  . $(brew --prefix nvm)/nvm.sh
+  . "${BASH_IT_HOMEBREW_PREFIX}/nvm.sh"
 else
   [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 fi