diff options
author | Sergei Shishov <sshishov@users.noreply.github.com> | 2021-12-05 11:48:00 +0400 |
---|---|---|
committer | Marc Cornellà <hello@mcornella.com> | 2021-12-21 19:08:53 +0100 |
commit | bd0b4b64c6ceaddbd01c6ec35a56f1d72bae4072 (patch) | |
tree | df3dc2d5e8aac6d92aaa51aaacdf14d9688f636c /plugins/asdf/asdf.plugin.zsh | |
parent | 8ae373130c8da1458323a196505355c710869e38 (diff) | |
download | zsh-bd0b4b64c6ceaddbd01c6ec35a56f1d72bae4072.tar.gz zsh-bd0b4b64c6ceaddbd01c6ec35a56f1d72bae4072.tar.bz2 zsh-bd0b4b64c6ceaddbd01c6ec35a56f1d72bae4072.zip |
fix(asdf): fix path to Homebrew installation of `asdf` (#10481)
Fixes #10484
Closes #10481
Diffstat (limited to 'plugins/asdf/asdf.plugin.zsh')
-rw-r--r-- | plugins/asdf/asdf.plugin.zsh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh index c386d57ed..da53eef8e 100644 --- a/plugins/asdf/asdf.plugin.zsh +++ b/plugins/asdf/asdf.plugin.zsh @@ -4,16 +4,18 @@ ASDF_COMPLETIONS="$ASDF_DIR/completions" # If not found, check for Homebrew package if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && (( $+commands[brew] )); then - ASDF_DIR="$(brew --prefix asdf)" - ASDF_COMPLETIONS="$ASDF_DIR/etc/bash_completion.d" + brew_prefix="$(brew --prefix asdf)" + ASDF_DIR="${brew_prefix}/libexec" + ASDF_COMPLETIONS="${brew_prefix}/etc/bash_completion.d" + unset brew_prefix fi # Load command if [[ -f "$ASDF_DIR/asdf.sh" ]]; then - . "$ASDF_DIR/asdf.sh" + . "$ASDF_DIR/asdf.sh" - # Load completions - if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then - . "$ASDF_COMPLETIONS/asdf.bash" - fi + # Load completions + if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then + . "$ASDF_COMPLETIONS/asdf.bash" + fi fi |