From 0fb5b76c0d5f00008123004a0e3170f357ecfa76 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sun, 10 Jul 2016 14:28:58 +0900 Subject: [PATCH] [fzf-tmux] Fail fast if fzf excutable is not found --- bin/fzf-tmux | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/fzf-tmux b/bin/fzf-tmux index 4ab899a..54abf4c 100755 --- a/bin/fzf-tmux +++ b/bin/fzf-tmux @@ -2,6 +2,14 @@ # fzf-tmux: starts fzf in a tmux pane # usage: fzf-tmux [-u|-d [HEIGHT[%]]] [-l|-r [WIDTH[%]]] [--] [FZF OPTIONS] +fail() { + >&2 echo "$1" + exit 2 +} + +fzf="$(command -v fzf 2> /dev/null)" || fzf="$(dirname "$0")/fzf" +[[ -x "$fzf" ]] || fail 'fzf executable not found' + args=() opt="" skip="" @@ -117,13 +125,6 @@ cleanup() { } trap cleanup EXIT SIGINT SIGTERM -fail() { - >&2 echo "$1" - exit 2 -} -fzf="$(which fzf 2> /dev/null)" || fzf="$(dirname "$0")/fzf" -[ -x "$fzf" ] || fail "fzf executable not found" - envs="env TERM=$TERM " [ -n "$FZF_DEFAULT_OPTS" ] && envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")" [ -n "$FZF_DEFAULT_COMMAND" ] && envs="$envs FZF_DEFAULT_COMMAND=$(printf %q "$FZF_DEFAULT_COMMAND")"