diff options
| author | dbaio <dbaio@FreeBSD.org> | 2018-03-17 20:15:31 +0800 |
|---|---|---|
| committer | dbaio <dbaio@FreeBSD.org> | 2018-03-17 20:15:31 +0800 |
| commit | 12cceed83618ad4cc63d3859fc94b83a7ff8ea6d (patch) | |
| tree | ebcffceddcd668e62236b82b92b9efb9a76a0b4b /textproc | |
| parent | 3252960aff44067746a410258f273ca49d2d6f45 (diff) | |
| download | freebsd-ports-gnome-12cceed83618ad4cc63d3859fc94b83a7ff8ea6d.tar.gz freebsd-ports-gnome-12cceed83618ad4cc63d3859fc94b83a7ff8ea6d.tar.zst freebsd-ports-gnome-12cceed83618ad4cc63d3859fc94b83a7ff8ea6d.zip | |
textproc/fzf: Fix patches
The patches for this port got mangled in the last update.
This patch corrects that so the completion for kill(1) works again
if one is using the example shell completion files.
PR: 226654
Submitted by: Sascha Holzleiter <sascha@root-login.org> (maintainer)
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/fzf/Makefile | 1 | ||||
| -rw-r--r-- | textproc/fzf/files/patch-shell_completion.bash | 5 | ||||
| -rw-r--r-- | textproc/fzf/files/patch-shell_completion.zsh | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile index d44d55b1720b..e75ae4041332 100644 --- a/textproc/fzf/Makefile +++ b/textproc/fzf/Makefile @@ -3,6 +3,7 @@ PORTNAME= fzf PORTVERSION= 0.17.3 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= sascha@root-login.org diff --git a/textproc/fzf/files/patch-shell_completion.bash b/textproc/fzf/files/patch-shell_completion.bash index 3eedbc3bd22c..3478b47ff543 100644 --- a/textproc/fzf/files/patch-shell_completion.bash +++ b/textproc/fzf/files/patch-shell_completion.bash @@ -1,12 +1,11 @@ --- shell/completion.bash.orig 2017-12-03 14:55:24 UTC +++ shell/completion.bash -@@ -219,7 +219,8 @@ _fzf_complete_kill() { +@@ -219,7 +219,7 @@ _fzf_complete_kill() { local selected fzf fzf="$(__fzfcmd_complete)" - selected=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ') -+ selected=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAU -+LT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ') ++ selected=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ') printf '\e[5n' if [ -n "$selected" ]; then diff --git a/textproc/fzf/files/patch-shell_completion.zsh b/textproc/fzf/files/patch-shell_completion.zsh index ee6b7d6d6d5e..309f148b9a12 100644 --- a/textproc/fzf/files/patch-shell_completion.zsh +++ b/textproc/fzf/files/patch-shell_completion.zsh @@ -1,13 +1,11 @@ --- shell/completion.zsh.orig 2017-12-03 14:55:24 UTC +++ shell/completion.zsh -@@ -163,7 +163,9 @@ fzf-completion() { +@@ -163,7 +163,7 @@ fzf-completion() { # Kill completion (do not require trigger sequence) if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then fzf="$(__fzfcmd_complete)" - matches=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ') -+ matches=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFA -+ULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' -+' ') ++ matches=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ') if [ -n "$matches" ]; then LBUFFER="$LBUFFER$matches" fi |