Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-11 00:10:08 +00:00
Code Releases Activity

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

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

Fixes #11459
This commit is contained in:
Marc Cornellà 2023-01-27 16:22:27 +01:00 committed by GitHub
parent e55e3f0f56
commit b0bffcaf86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/fzf/README.md
View file

@ -50,12 +50,3 @@ Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C):
```zsh ```zsh
DISABLE_FZF_KEY_BINDINGS="true" 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
```

4
plugins/fzf/fzf.plugin.zsh
View file

@ -60,7 +60,7 @@ function fzf_setup_using_base_dir() {
function fzf_setup_using_debian() { 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 # Not a debian based distro
return 1 return 1
fi fi
@ -81,7 +81,7 @@ function fzf_setup_using_debian() {
key_bindings="${PREFIX}/share/fzf/key-bindings.zsh" 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 # fzf not installed
return 1 return 1
fi fi