From owner-svn-ports-head@freebsd.org Wed Oct 25 13:19:31 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56D3FE49E58; Wed, 25 Oct 2017 13:19:31 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 310276C639; Wed, 25 Oct 2017 13:19:31 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9PDJUFN060980; Wed, 25 Oct 2017 13:19:30 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9PDJUQE060976; Wed, 25 Oct 2017 13:19:30 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201710251319.v9PDJUQE060976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Wed, 25 Oct 2017 13:19:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452845 - in head/textproc/fzf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: olgeni X-SVN-Commit-Paths: in head/textproc/fzf: . files X-SVN-Commit-Revision: 452845 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2017 13:19:31 -0000 Author: olgeni Date: Wed Oct 25 13:19:29 2017 New Revision: 452845 URL: https://svnweb.freebsd.org/changeset/ports/452845 Log: textproc/fzf: quick compatibility fix for kill command autocompletion. Added: head/textproc/fzf/files/patch-shell_completion.bash (contents, props changed) head/textproc/fzf/files/patch-shell_completion.zsh (contents, props changed) Modified: head/textproc/fzf/Makefile Modified: head/textproc/fzf/Makefile ============================================================================== --- head/textproc/fzf/Makefile Wed Oct 25 12:43:31 2017 (r452844) +++ head/textproc/fzf/Makefile Wed Oct 25 13:19:29 2017 (r452845) @@ -3,7 +3,7 @@ PORTNAME= fzf PORTVERSION= 0.16.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= sascha@root-login.org Added: head/textproc/fzf/files/patch-shell_completion.bash ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/fzf/files/patch-shell_completion.bash Wed Oct 25 13:19:29 2017 (r452845) @@ -0,0 +1,11 @@ +--- shell/completion.bash.orig 2017-10-25 13:15:42 UTC ++++ shell/completion.bash +@@ -215,7 +215,7 @@ _fzf_complete_kill() { + + local selected fzf + fzf="$(__fzfcmd_complete)" +- selected=$(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' ' ') + printf '\e[5n' + + if [ -n "$selected" ]; then Added: head/textproc/fzf/files/patch-shell_completion.zsh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/fzf/files/patch-shell_completion.zsh Wed Oct 25 13:19:29 2017 (r452845) @@ -0,0 +1,11 @@ +--- shell/completion.zsh.orig 2017-10-25 13:15:38 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=$(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' ' ') + if [ -n "$matches" ]; then + LBUFFER="$LBUFFER$matches" + fi