Skip to content

Commit 1c9d2e7

Browse files
committed
shell/fzf: update shell completion sourcing
1 parent 5a4a148 commit 1c9d2e7

1 file changed

Lines changed: 11 additions & 32 deletions

File tree

shell/fzf.sh

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,14 @@
11
#!/usr/bin/env bash
22

3-
# Arch
4-
if [ "${BASH_VERSION}" ] && [ -r /usr/share/fzf/key-bindings.bash ]; then
5-
# shellcheck source=/dev/null
6-
. /usr/share/fzf/key-bindings.bash
7-
fi
8-
if [ "${BASH_VERSION}" ] && [ -r /usr/share/fzf/completion.bash ]; then
9-
# shellcheck source=/dev/null
10-
. /usr/share/fzf/completion.bash
11-
fi
12-
13-
if [ "${ZSH_VERSION}" ] && [ -r /usr/share/fzf/key-bindings.zsh ]; then
14-
# shellcheck source=/dev/null
15-
. /usr/share/fzf/key-bindings.zsh
16-
fi
17-
if [ "${ZSH_VERSION}" ] && [ -r /usr/share/fzf/completion.zsh ]; then
18-
# shellcheck source=/dev/null
19-
. /usr/share/fzf/completion.zsh
20-
fi
21-
22-
# NixOS
23-
if [ "${BASH_VERSION}" ] && command -v fzf-share >/dev/null; then
24-
# shellcheck source=/dev/null
25-
. "$(fzf-share)/key-bindings.bash"
26-
# shellcheck source=/dev/null
27-
. "$(fzf-share)/completion.bash"
28-
fi
29-
30-
if [ "${ZSH_VERSION}" ] && command -v fzf-share >/dev/null; then
31-
# shellcheck source=/dev/null
32-
. "$(fzf-share)/key-bindings.zsh"
33-
# shellcheck source=/dev/null
34-
. "$(fzf-share)/completion.zsh"
3+
if command -v fzf >/dev/null 2>&1; then
4+
if [ -n "${BASH_VERSION-}" ]; then
5+
# shellcheck source=/dev/null
6+
eval "$(fzf --bash)"
7+
elif [ -n "${ZSH_VERSION-}" ]; then
8+
# shellcheck source=/dev/null
9+
source <(fzf --zsh)
10+
elif [ -n "${FISH_VERSION-}" ]; then
11+
# shellcheck source=/dev/null
12+
fzf --fish | source
13+
fi
3514
fi

0 commit comments

Comments
 (0)