diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2021-11-06 15:47:31 -0600 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-11-06 15:47:31 -0600 |
commit | 2a977876c6e85847652f097cc128e4ed5bec147a (patch) | |
tree | 4dba20c6aea6ea18723fa9e47b181580767aee37 /plugins/fzf | |
parent | fad92c603be0ff36825cc53bf8c485d4b95c7869 (diff) | |
parent | b2f35a7b98455b2bb8c7c3b11db6aa587e1d28bf (diff) | |
download | zsh-2a977876c6e85847652f097cc128e4ed5bec147a.tar.gz zsh-2a977876c6e85847652f097cc128e4ed5bec147a.tar.bz2 zsh-2a977876c6e85847652f097cc128e4ed5bec147a.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/fzf')
-rw-r--r-- | plugins/fzf/fzf.plugin.zsh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh index a979fe222..aabd62cb1 100644 --- a/plugins/fzf/fzf.plugin.zsh +++ b/plugins/fzf/fzf.plugin.zsh @@ -20,7 +20,9 @@ function setup_using_base_dir() { done if [[ -z "${fzf_base}" ]]; then - if (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then + if (( ${+commands[fzf-share]} )) && dir="$(fzf-share)" && [[ -d "${dir}" ]]; then + fzf_base="${dir}" + elif (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then if [[ -d "${dir}" ]]; then fzf_base="${dir}" fi |