diff options
| author | eric-christian <298704+eric-christian@users.noreply.github.com> | 2019-02-08 15:14:09 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2019-02-08 15:14:09 +0100 |
| commit | 86ea319536a8012b9e8f508d3d257029014bdafe (patch) | |
| tree | 5c5a19b24f0044bf7f73b1c777e3c94299d70e2b /plugins/asdf/asdf.plugin.zsh | |
| parent | 052493b1ba71fe7e13554e57571fe4c793d53c3c (diff) | |
| download | zsh-86ea319536a8012b9e8f508d3d257029014bdafe.tar.gz zsh-86ea319536a8012b9e8f508d3d257029014bdafe.tar.bz2 zsh-86ea319536a8012b9e8f508d3d257029014bdafe.zip | |
asdf: fix homebrew installation path (#7582)
* The check for the asdf installation directory is more precise:
The existence of the directory `$HOME/.asdf` does not mean that it is the installation
directory of `asdf`. It will also be created after installing at least one asdf plugin.
* Completions, while installed with homebrew, are now expected on an alternative location.
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 |