fzf: update to 0.10.8

Drop our custom changes to bash and zsh completion. It's not our job to
fix fundamental issues of upstream.
This commit is contained in:
Dominik Honnef 2015-10-24 22:00:27 +02:00
parent aed7c704a6
commit 38ec518279
6 changed files with 4 additions and 53 deletions

View file

@ -1,7 +0,0 @@
__fzfcmd() {
[ ${FZF_TMUX:-1} -eq 1 ] && echo "fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}" || echo "fzf"
}
cd "${$(command \find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
-o -type d -print 2> /dev/null | sed 1d | cut -b3- | $(__fzfcmd) +m):-.}"
zle reset-prompt

View file

@ -1,2 +0,0 @@
LBUFFER="${LBUFFER}$(fzf-fsel)"
zle redisplay

View file

@ -1,12 +0,0 @@
#!/bin/bash
__fzfcmd() {
[ ${FZF_TMUX:-1} -eq 1 ] && echo "fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}" || echo "fzf"
}
command find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
-o -type f -print \
-o -type d -print \
-o -type l -print 2> /dev/null | sed 1d | cut -b3- | $(__fzfcmd) -m | while read item; do
printf '%q ' "$item"
done
echo

View file

@ -1,12 +0,0 @@
__fzfcmd() {
[ ${FZF_TMUX:-1} -eq 1 ] && echo "fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}" || echo "fzf"
}
local selected restore_no_bang_hist
if selected=( $(fc -l 1 | $(__fzfcmd) +s --tac +m -n2..,.. --tiebreak=index --toggle-sort=ctrl-r -q "$LBUFFER") ); then
num=$selected[1]
if [ -n "$num" ]; then
zle vi-fetch-history -n $num
fi
fi
zle redisplay

View file

@ -1,11 +0,0 @@
autoload -Uz fzf-file-widget
autoload -Uz fzf-cd-widget
autoload -Uz fzf-history-widget
zle -N fzf-file-widget
zle -N fzf-cd-widget
zle -N fzf-history-widget
bindkey '^T' fzf-file-widget
bindkey '\ec' fzf-cd-widget
bindkey '^R' fzf-history-widget

View file

@ -1,6 +1,6 @@
# Template file for 'fzf'
pkgname=fzf
version=0.10.7
version=0.10.8
revision=1
build_style=go
go_import_path="github.com/junegunn/fzf/src"
@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/junegunn/fzf"
short_desc="A command-line fuzzy finder"
distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
checksum=d73297b058fa7eb993d7199d9575f9552e160c79117067b14171cf0087d53246
checksum=95ba7d39a311609f69d63bc2272f97aec92c974fe5a9560a4a0730b95828e4f4
pre_build() {
cd src
@ -21,19 +21,14 @@ pre_build() {
post_install() {
cd ${wrksrc}
vbin bin/fzf-tmux
vbin ${FILESDIR}/fzf-fsel
vman man/man1/fzf.1
vlicense LICENSE
sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
sed -i -e 's/(__fzf_select__)/(fzf-fsel)/' shell/key-bindings.bash
vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
vinstall shell/completion.bash 644 usr/share/bash-completion/completions fzf
vinstall ${FILESDIR}/fzf-file-widget 644 usr/share/zsh/site-functions
vinstall ${FILESDIR}/fzf-cd-widget 644 usr/share/zsh/site-functions
vinstall ${FILESDIR}/fzf-history-widget 644 usr/share/zsh/site-functions
vinstall ${FILESDIR}/key-bindings.zsh 644 usr/share/doc/fzf
vinstall shell/completion.zsh 644 usr/share/doc/fzf
vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf
vinstall shell/key-bindings.bash 644 usr/share/doc/fzf
vinstall shell/key-bindings.fish 644 usr/share/doc/fzf
vinstall shell/completion.zsh 644 usr/share/doc/fzf
}