Attachment #191547 for bug #226654

View | Details | Raw Unified | Return to bug 226654
Collapse All | Expand All

Lines 3-8 Link Here

(-)fzf/Makefile (+1 lines)
3		3
4	PORTNAME= fzf	4	PORTNAME= fzf
5	PORTVERSION= 0.17.3	5	PORTVERSION= 0.17.3
		6	PORTREVISION= 1
6	CATEGORIES= textproc	7	CATEGORIES= textproc
7		8
8	MAINTAINER= sascha@root-login.org	9	MAINTAINER= sascha@root-login.org




--- shell/completion.bash.orig	2017-12-03 14:55:24 UTC
+++ shell/completion.bash
@@ -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_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ')
+LT_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




--- shell/completion.zsh.orig	2017-12-03 14:55:24 UTC
+++ shell/completion.zsh
@@ -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_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ')
+ULT_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

Return to bug 226654

Lines 1-12 Link Here

(-)fzf/files/patch-shell_completion.bash (-3 / +2 lines)
1	--- shell/completion.bash.orig 2017-12-03 14:55:24 UTC	1	--- shell/completion.bash.orig 2017-12-03 14:55:24 UTC
2	+++ shell/completion.bash	2	+++ shell/completion.bash
3	@@ -219,7 +219,8 @@ _fzf_complete_kill() {	3	@@ -219,7 +219,7 @@ _fzf_complete_kill() {
4		4
5	local selected fzf	5	local selected fzf
6	fzf="$(__fzfcmd_complete)"	6	fzf="$(__fzfcmd_complete)"
7	- 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' ' ')	7	- 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' ' ')
8	+ selected=$(ps -uef \| sed 1d \| FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAU	8	+ 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' ' ')
9	+LT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m \| awk '{print $2}' \| tr '\n' ' ')
10	printf '\e[5n'	9	printf '\e[5n'
11		10
12	if [ -n "$selected" ]; then	11	if [ -n "$selected" ]; then

Lines 1-13 Link Here

(-)fzf/files/patch-shell_completion.zsh (-4 / +2 lines)
1	--- shell/completion.zsh.orig 2017-12-03 14:55:24 UTC	1	--- shell/completion.zsh.orig 2017-12-03 14:55:24 UTC
2	+++ shell/completion.zsh	2	+++ shell/completion.zsh
3	@@ -163,7 +163,9 @@ fzf-completion() {	3	@@ -163,7 +163,7 @@ fzf-completion() {
4	# Kill completion (do not require trigger sequence)	4	# Kill completion (do not require trigger sequence)
5	if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then	5	if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then
6	fzf="$(__fzfcmd_complete)"	6	fzf="$(__fzfcmd_complete)"
7	- 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' ' ')	7	- 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' ' ')
8	+ matches=$(ps -uef \| sed 1d \| FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFA	8	+ 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' ' ')
9	+ULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m \| awk '{print $2}' \| tr '\n'
10	+' ')
11	if [ -n "$matches" ]; then	9	if [ -n "$matches" ]; then
12	LBUFFER="$LBUFFER$matches"	10	LBUFFER="$LBUFFER$matches"
13	fi	11	fi