holm/ohmyzsh
1
1
Fork 0
forked from extern/ohmyzsh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fzf: Fix shell directory for archlinux package (#7119)

Browse Source 
* fzf: Fix shell directory for archlinux package

* fzf: Don't clutter PATH if fzf already available

* brew has it available via symlink in /usr/local/bin
* Fedora and Arch packages have it place in /usr/bin

* fzf: Fix archlinux guess by using release file

* fzf: unset leftover variables
This commit is contained in:
Maxime Brunet 2018-09-08 09:31:13 -04:00 committed by Marc Cornellà
parent f73c29a820
commit bb908495de
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/fzf/fzf.plugin.zsh
View File

@ -24,22 +24,29 @@ fi
if [[ -n "${fzf_base}" ]]; then if [[ -n "${fzf_base}" ]]; then
# Fix fzf shell directory for Archlinux package
if [[ ! -d "${fzf_base}/shell" ]] && [[ -f /etc/arch-release ]]; then
fzf_shell="${fzf_base}"
else
fzf_shell="${fzf_base}/shell"
fi
# Setup fzf # Setup fzf
# --------- # ---------
if [[ ! "$PATH" == *$fzf_base/bin* ]]; then if ! (( ${+commands[fzf]} )) && [[ ! "$PATH" == *$fzf_base/bin* ]]; then
export PATH="$PATH:$fzf_base/bin" export PATH="$PATH:$fzf_base/bin"
fi fi
# Auto-completion # Auto-completion
# --------------- # ---------------
if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
[[ $- == *i* ]] && source "$fzf_base/shell/completion.zsh" 2> /dev/null [[ $- == *i* ]] && source "${fzf_shell}/completion.zsh" 2> /dev/null
fi fi
# Key bindings # Key bindings
# ------------ # ------------
if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
source "$fzf_base/shell/key-bindings.zsh" source "${fzf_shell}/key-bindings.zsh"
fi fi
else else
@ -47,4 +54,4 @@ else
"Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2 "Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2
fi fi
unset fzf_base unset fzf_base fzf_shell dir fzfdirs