diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2019-10-24 17:57:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 17:57:01 +0200 |
| commit | cad48e38bfbfa6e3e0096caddf330d6fc8f1ffb9 (patch) | |
| tree | 2b07ec259bbd2b1a4919245669900a87fa87a03b /plugins/asdf/asdf.plugin.zsh | |
| parent | 225425fe091ca052997833279ccc08643818c24a (diff) | |
| parent | 40df67bc3b9b51caa24df5d220487043040d1f9a (diff) | |
| download | zsh-cad48e38bfbfa6e3e0096caddf330d6fc8f1ffb9.tar.gz zsh-cad48e38bfbfa6e3e0096caddf330d6fc8f1ffb9.tar.bz2 zsh-cad48e38bfbfa6e3e0096caddf330d6fc8f1ffb9.zip | |
Merge branch 'master' into fabric_task_description
Diffstat (limited to 'plugins/asdf/asdf.plugin.zsh')
| -rw-r--r-- | plugins/asdf/asdf.plugin.zsh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh index 8736d2ff8..38b225538 100644 --- a/plugins/asdf/asdf.plugin.zsh +++ b/plugins/asdf/asdf.plugin.zsh @@ -1,7 +1,19 @@ -# Find where asdf should be installed. +# Find where asdf should be installed ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}" +ASDF_COMPLETIONS="$ASDF_DIR/completions" -# Load asdf, if found. -if [ -f $ASDF_DIR/asdf.sh ]; then - . $ASDF_DIR/asdf.sh +# If not found, check for Homebrew package +if [[ ! -f "$ASDF_DIR/asdf.sh" ]] && (( $+commands[brew] )); then + ASDF_DIR="$(brew --prefix asdf)" + ASDF_COMPLETIONS="$ASDF_DIR/etc/bash_completion.d" +fi + +# Load command +if [[ -f "$ASDF_DIR/asdf.sh" ]]; then + . "$ASDF_DIR/asdf.sh" + + # Load completions + if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then + . "$ASDF_COMPLETIONS/asdf.bash" + fi fi |