Use command find rather than plain find

Aliases are expanded in shell scripts, and one may have an alias
for the `find` command that conflicts with fzf. So make sure fzf
is using real find command rather than the alias.
This commit is contained in:
Sencer Selcuk 2014-06-17 23:32:33 -04:00
parent 61ba8d5a11
commit 3827a1b09e

12
install
View File

@ -98,7 +98,7 @@ EOF
# Key bindings # Key bindings
# ------------ # ------------
__fsel() { __fsel() {
find * -path '*/\.*' -prune \ command find * -path '*/\.*' -prune \
-o -type f -print \ -o -type f -print \
-o -type d -print \ -o -type d -print \
-o -type l -print 2> /dev/null | fzf -m | while read item; do -o -type l -print 2> /dev/null | fzf -m | while read item; do
@ -122,7 +122,7 @@ __fsel_tmux() {
__fcd() { __fcd() {
local dir local dir
dir=$(find ${1:-*} -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m) && printf 'cd %q' "$dir" dir=$(command find ${1:-*} -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m) && printf 'cd %q' "$dir"
} }
__use_tmux=0 __use_tmux=0
@ -174,7 +174,7 @@ EOFZF
# CTRL-T - Paste the selected file path(s) into the command line # CTRL-T - Paste the selected file path(s) into the command line
__fsel() { __fsel() {
set -o nonomatch set -o nonomatch
find * -path '*/\.*' -prune \ command find * -path '*/\.*' -prune \
-o -type f -print \ -o -type f -print \
-o -type d -print \ -o -type d -print \
-o -type l -print 2> /dev/null | fzf -m | while read item; do -o -type l -print 2> /dev/null | fzf -m | while read item; do
@ -207,7 +207,7 @@ bindkey '^T' fzf-file-widget
# ALT-C - cd into the selected directory # ALT-C - cd into the selected directory
fzf-cd-widget() { fzf-cd-widget() {
cd "${$(set -o nonomatch; find * -path '*/\.*' -prune \ cd "${$(set -o nonomatch; command find * -path '*/\.*' -prune \
-o -type d -print 2> /dev/null | fzf):-.}" -o -type d -print 2> /dev/null | fzf):-.}"
zle reset-prompt zle reset-prompt
} }
@ -248,7 +248,7 @@ EOFZF
cat > ~/.config/fish/functions/fzf_key_bindings.fish << "EOFZF" cat > ~/.config/fish/functions/fzf_key_bindings.fish << "EOFZF"
function fzf_key_bindings function fzf_key_bindings
function __fzf_select function __fzf_select
find * -path '*/\.*' -prune \ command find * -path '*/\.*' -prune \
-o -type f -print \ -o -type f -print \
-o -type d -print \ -o -type d -print \
-o -type l -print 2> /dev/null | fzf -m | while read item -o -type l -print 2> /dev/null | fzf -m | while read item
@ -283,7 +283,7 @@ function fzf_key_bindings
end end
function __fzf_alt_c function __fzf_alt_c
find * -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m > $TMPDIR/fzf.result command find * -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m > $TMPDIR/fzf.result
if [ (cat $TMPDIR/fzf.result | wc -l) -gt 0 ] if [ (cat $TMPDIR/fzf.result | wc -l) -gt 0 ]
cd (cat $TMPDIR/fzf.result) cd (cat $TMPDIR/fzf.result)
end end