From 5c491d573a147573c68aa7e56a6032dbe4b84635 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Tue, 13 Jan 2015 02:39:00 +0900 Subject: [PATCH] Fix fzf.{bash,zsh} when Go version is not supported --- install | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/install b/install index f8307cf..4098c87 100755 --- a/install +++ b/install @@ -152,20 +152,29 @@ for shell in bash zsh; do fzf_completion="# $fzf_completion" fi - cat > $src << EOF + if [ -n "$binary_error" ]; then + cat > $src << EOF # Setup fzf function # ------------------ unalias fzf 2> /dev/null +fzf() { + $fzf_cmd "\$@" +} +export -f fzf > /dev/null + +# Auto-completion +# --------------- +$fzf_completion + +EOF + else + cat > $src << EOF +# Setup fzf +# --------- +unalias fzf 2> /dev/null unset fzf 2> /dev/null -if [ -x "$fzf_base/bin/fzf" ]; then - if [[ ! "\$PATH" =~ "$fzf_base/bin" ]]; then - export PATH="$fzf_base/bin:\$PATH" - fi -else - fzf() { - $fzf_cmd "\$@" - } - export -f fzf > /dev/null +if [[ ! "\$PATH" =~ "$fzf_base/bin" ]]; then + export PATH="$fzf_base/bin:\$PATH" fi # Auto-completion @@ -173,6 +182,7 @@ fi $fzf_completion EOF + fi if [ $key_bindings -eq 0 ]; then if [ $shell = bash ]; then