diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
| commit | 49edbf438ed690c76e6b2af80368c59404cf0167 (patch) | |
| tree | 129b3adb2f5f39a1329a426a3b7d51ed2c2290c1 /plugins/asdf/asdf.plugin.zsh | |
| parent | 1bc186dabe12b3d01b2257e82f3a104c48b8b3c7 (diff) | |
| parent | 78c91ccbf99c77bd4d9cdb74279a40776721f66d (diff) | |
| download | zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.gz zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.bz2 zsh-49edbf438ed690c76e6b2af80368c59404cf0167.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/asdf/asdf.plugin.zsh')
| -rw-r--r-- | plugins/asdf/asdf.plugin.zsh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh index c386d57ed..3016282c6 100644 --- a/plugins/asdf/asdf.plugin.zsh +++ b/plugins/asdf/asdf.plugin.zsh @@ -2,18 +2,26 @@ ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}" ASDF_COMPLETIONS="$ASDF_DIR/completions" +# If not found, check for archlinux/AUR package (/opt/asdf-vm/) +if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && [[ -f "/opt/asdf-vm/asdf.sh" ]]; then + ASDF_DIR="/opt/asdf-vm" + ASDF_COMPLETIONS="$ASDF_DIR" +fi + # 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 |