diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2019-02-15 10:51:57 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2019-02-15 10:51:57 -0700 |
| commit | fb141c2257f648cd29b64cbd3f2ca9123f6e427f (patch) | |
| tree | a7e56fe7edad0e231aaa4ff0f6f74ce0bad1d368 /plugins/asdf/asdf.plugin.zsh | |
| parent | 89c9e8a7bc177d4cff6ba8d28cf6b57a9a603095 (diff) | |
| parent | 965a27aa69b49f4e447bcaae913e71a010f7d141 (diff) | |
| download | zsh-fb141c2257f648cd29b64cbd3f2ca9123f6e427f.tar.gz zsh-fb141c2257f648cd29b64cbd3f2ca9123f6e427f.tar.bz2 zsh-fb141c2257f648cd29b64cbd3f2ca9123f6e427f.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/asdf/asdf.plugin.zsh')
| -rw-r--r-- | plugins/asdf/asdf.plugin.zsh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh index 75395c718..38b225538 100644 --- a/plugins/asdf/asdf.plugin.zsh +++ b/plugins/asdf/asdf.plugin.zsh @@ -1,9 +1,11 @@ # Find where asdf should be installed ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}" +ASDF_COMPLETIONS="$ASDF_DIR/completions" # If not found, check for Homebrew package -if [[ ! -d $ASDF_DIR ]] && (( $+commands[brew] )); then +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 @@ -11,7 +13,7 @@ if [[ -f "$ASDF_DIR/asdf.sh" ]]; then . "$ASDF_DIR/asdf.sh" # Load completions - if [[ -f "$ASDF_DIR/completions/asdf.bash" ]]; then - . "$ASDF_DIR/completions/asdf.bash" + if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then + . "$ASDF_COMPLETIONS/asdf.bash" fi fi |