diff --git a/completion/available/brew.completion.bash b/completion/available/brew.completion.bash index 2149d20d..61998f8a 100644 --- a/completion/available/brew.completion.bash +++ b/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 diff --git a/completion/available/system.completion.bash b/completion/available/system.completion.bash index b64fb82b..142e0880 100755 --- a/completion/available/system.completion.bash +++ b/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 diff --git a/plugins/available/autojump.plugin.bash b/plugins/available/autojump.plugin.bash index 345ecadb..7e6df7fc 100644 --- a/plugins/available/autojump.plugin.bash +++ b/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 diff --git a/plugins/available/nvm.plugin.bash b/plugins/available/nvm.plugin.bash index e845d922..87dce644 100644 --- a/plugins/available/nvm.plugin.bash +++ b/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