diff options
| author | Marc Cornellà <hello@mcornella.com> | 2023-01-27 16:22:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 16:22:27 +0100 |
| commit | b0bffcaf865434711d98b63eddd0aa52be0fbeb1 (patch) | |
| tree | 69566c45cb63983e27c89e2a81ae57849bf59e10 | |
| parent | e55e3f0f56ab4df21eb33e19569c295e7e5e71a4 (diff) | |
| download | zsh-b0bffcaf865434711d98b63eddd0aa52be0fbeb1.tar.gz zsh-b0bffcaf865434711d98b63eddd0aa52be0fbeb1.tar.bz2 zsh-b0bffcaf865434711d98b63eddd0aa52be0fbeb1.zip | |
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
| -rw-r--r-- | plugins/fzf/README.md | 9 | ||||
| -rw-r--r-- | plugins/fzf/fzf.plugin.zsh | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md index 7e3e3e5b0..beedf4690 100644 --- a/plugins/fzf/README.md +++ b/plugins/fzf/README.md @@ -50,12 +50,3 @@ Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C): ```zsh DISABLE_FZF_KEY_BINDINGS="true" ``` - -### Skip `dpkg` loading - -If you have `dpkg` available in your `$PATH` but you don't want to load `fzf` from there, and facing some -issues, you can define this option before loading `oh-my-zsh` in order to skip that loading: - -```zsh -zstyle ':omz:plugins:fzf' skip-dpkg yes -``` diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh index c07d38493..7bb6667d0 100644 --- a/plugins/fzf/fzf.plugin.zsh +++ b/plugins/fzf/fzf.plugin.zsh @@ -60,7 +60,7 @@ function fzf_setup_using_base_dir() { function fzf_setup_using_debian() { - if (( ! $+commands[dpkg] )) || zstyle -t ':omz:plugins:fzf' skip-dpkg; then + if (( ! $+commands[apt] && ! $+commands[apt-get] )); then # Not a debian based distro return 1 fi @@ -81,7 +81,7 @@ function fzf_setup_using_debian() { key_bindings="${PREFIX}/share/fzf/key-bindings.zsh" ;; *) - if [[ ! -f /usr/bin/fzf ]]; then + if [[ ! -d /usr/share/doc/fzf/examples ]]; then # fzf not installed return 1 fi |