b0bffcaf865434711d98b63eddd0aa52be0fbeb1

Author
Marc Cornellà <hello@mcornella.com>
Committer
GitHub <noreply@github.com>
Date

Message

fix(fzf): fix check for true Debian-like in debian setup function (#11460)

Check for `apt` and `apt-get` in debian setup function.
Look for exact directory in debian-like setup function.

Fixes #11459

Diff

 1diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
 2index 7e3e3e5b0e70b7d4657228f9f4c6b67d018c0379..beedf4690993ae12b83fdf80e0a3889c2e9dfec9 100644
 3--- a/plugins/fzf/README.md
 4+++ b/plugins/fzf/README.md
 5@@ -50,12 +50,3 @@ Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C):
 6 ```zsh
 7 DISABLE_FZF_KEY_BINDINGS="true"
 8 ```
 9-
10-### Skip `dpkg` loading
11-
12-If you have `dpkg` available in your `$PATH` but you don't want to load `fzf` from there, and facing some
13-issues, you can define this option before loading `oh-my-zsh` in order to skip that loading:
14-
15-```zsh
16-zstyle ':omz:plugins:fzf' skip-dpkg yes
17-```
18diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
19index c07d3849300c578185d530d4efa1e5489033e6f8..7bb6667d005187e9176a3aee8573e376f055e6f7 100644
20--- a/plugins/fzf/fzf.plugin.zsh
21+++ b/plugins/fzf/fzf.plugin.zsh
22@@ -60,7 +60,7 @@ function fzf_setup_using_base_dir() {
23 
24 
25 function fzf_setup_using_debian() {
26-  if (( ! $+commands[dpkg] )) || zstyle -t ':omz:plugins:fzf' skip-dpkg; then
27+  if (( ! $+commands[apt] && ! $+commands[apt-get] )); then
28     # Not a debian based distro 
29     return 1
30   fi
31@@ -81,7 +81,7 @@ function fzf_setup_using_debian() {
32       key_bindings="${PREFIX}/share/fzf/key-bindings.zsh"
33       ;;
34     *)
35-      if [[ ! -f /usr/bin/fzf ]]; then
36+      if [[ ! -d /usr/share/doc/fzf/examples ]]; then
37         # fzf not installed
38         return 1
39       fi