Index: head/textproc/fzf/Makefile =================================================================== --- head/textproc/fzf/Makefile (revision 452844) +++ head/textproc/fzf/Makefile (revision 452845) @@ -1,71 +1,71 @@ # Created by: Sascha Holzleiter # $FreeBSD$ PORTNAME= fzf PORTVERSION= 0.16.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= sascha@root-login.org COMMENT= Blazing fast command-line fuzzy finder LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler go USE_GITHUB= yes GH_ACCOUNT= junegunn GH_SUBDIR:= src/github.com/${GH_ACCOUNT}/${PORTNAME} GH_TUPLE= mattn:go-runewidth:14207d2:runwidth/src/github.com/mattn/go-runewidth \ mattn:go-shellwords:02e3cf0:shellwords/src/github.com/mattn/go-shellwords \ mattn:go-isatty:66b8e73:isatty/src/github.com/mattn/go-isatty \ gdamore:tcell:44772c1:tcell/src/github.com/gdamore/tcell \ golang:crypto:b8a2a83:terminal/src/golang.org/x/crypto SUB_FILES= pkg-message PLIST_FILES= bin/fzf man/man1/fzf.1.gz PORTEXAMPLES= shell/completion.bash shell/completion.zsh \ shell/key-bindings.bash shell/key-bindings.fish \ shell/key-bindings.zsh OPTIONS_DEFINE= EXAMPLES TMUX OPTIONS_DEFAULT= TMUX TMUX_DESC= Install fzf-tmux (depends on BASH) TMUX_RUN_DEPENDS= bash:shells/bash TMUX_PLIST_FILES= bin/fzf-tmux man/man1/fzf-tmux.1.gz GOENV= GOPATH=${WRKSRC} CGO_CFLAGS="${CGO_CFLAGS}" \ CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN="" do-build: cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && \ ${SETENV} ${MAKE_ENV} ${GOENV} ${GO_CMD} build -a \ -ldflags "-X main.revision=6dbc108 -w" -o bin/${PORTNAME} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && \ ${COPYTREE_SHARE} shell ${STAGEDIR}${EXAMPLESDIR}) post-install: ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${MANPREFIX}/man/man1 post-install-TMUX-on: ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-tmux ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf-tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include # If cc is clang, change it to clang to help Go identify the compiler, # else we get -pthread warnings .if ${COMPILER_TYPE} == "clang" && ${CC} == "cc" CC=clang .endif .include Index: head/textproc/fzf/files/patch-shell_completion.bash =================================================================== --- head/textproc/fzf/files/patch-shell_completion.bash (nonexistent) +++ head/textproc/fzf/files/patch-shell_completion.bash (revision 452845) @@ -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 Property changes on: head/textproc/fzf/files/patch-shell_completion.bash ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/fzf/files/patch-shell_completion.zsh =================================================================== --- head/textproc/fzf/files/patch-shell_completion.zsh (nonexistent) +++ head/textproc/fzf/files/patch-shell_completion.zsh (revision 452845) @@ -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 Property changes on: head/textproc/fzf/files/patch-shell_completion.zsh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property