From c7185c35f35d5c9a57a48815d379c5b1be47cd8a Mon Sep 17 00:00:00 2001 From: Julian Laubstein Date: Sun, 22 Apr 2018 20:27:12 +0200 Subject: Add completions to asdf plugin (#6046) --- plugins/asdf/asdf.plugin.zsh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'plugins/asdf/asdf.plugin.zsh') diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh index 8736d2ff8..d563cf5f8 100644 --- a/plugins/asdf/asdf.plugin.zsh +++ b/plugins/asdf/asdf.plugin.zsh @@ -5,3 +5,8 @@ ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}" if [ -f $ASDF_DIR/asdf.sh ]; then . $ASDF_DIR/asdf.sh fi + +# Load asdf completions, if found. +if [ -f $ASDF_DIR/completions/asdf.bash ]; then + . $ASDF_DIR/completions/asdf.bash +fi -- cgit v1.2.3-70-g09d2 From 05713785b0774f78e0aeb4cc4d793fdb529307db Mon Sep 17 00:00:00 2001 From: John Burwell Date: Tue, 7 Aug 2018 12:10:35 -0400 Subject: asdf: add Homebrew and completion support (#6749) * Modifies the search logic for asdf to include Homebrew when it is installed. The implementation is adapted from the pyenv plugin. --- plugins/asdf/asdf.plugin.zsh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'plugins/asdf/asdf.plugin.zsh') diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh index d563cf5f8..75395c718 100644 --- a/plugins/asdf/asdf.plugin.zsh +++ b/plugins/asdf/asdf.plugin.zsh @@ -1,12 +1,17 @@ -# Find where asdf should be installed. +# Find where asdf should be installed ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}" -# Load asdf, if found. -if [ -f $ASDF_DIR/asdf.sh ]; then - . $ASDF_DIR/asdf.sh +# If not found, check for Homebrew package +if [[ ! -d $ASDF_DIR ]] && (( $+commands[brew] )); then + ASDF_DIR="$(brew --prefix asdf)" fi -# Load asdf completions, if found. -if [ -f $ASDF_DIR/completions/asdf.bash ]; then - . $ASDF_DIR/completions/asdf.bash +# Load command +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" + fi fi -- cgit v1.2.3-70-g09d2 From 86ea319536a8012b9e8f508d3d257029014bdafe Mon Sep 17 00:00:00 2001 From: eric-christian <298704+eric-christian@users.noreply.github.com> Date: Fri, 8 Feb 2019 15:14:09 +0100 Subject: 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. --- plugins/asdf/asdf.plugin.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'plugins/asdf/asdf.plugin.zsh') 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 -- cgit v1.2.3-70-g09d2