From 325e98cd03c71d7e280b7259ff7793cec0afd726 Mon Sep 17 00:00:00 2001 From: Christopher Apple Date: Tue, 5 Nov 2019 20:06:45 -0700 Subject: [PATCH] Moved warning for no fzf to forgit::warn --- forgit.plugin.fish | 10 +++++----- forgit.plugin.zsh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forgit.plugin.fish b/forgit.plugin.fish index db36a0f..9bbc2aa 100755 --- a/forgit.plugin.fish +++ b/forgit.plugin.fish @@ -1,11 +1,6 @@ #!/usr/local/bin/fish # MIT (c) Chris Apple -if not hash fzf > /dev/null 2>&1 - echo "FZF not found and is requried for forgit" - exit 1 -end - function forgit::warn printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$argv" >&2; end @@ -18,6 +13,11 @@ function forgit::inside_work_tree git rev-parse --is-inside-work-tree >/dev/null; end +if not hash fzf > /dev/null 2>&1 + forgit::warn "FZF not found and is requried for forgit" + exit 1 +end + # https://github.com/so-fancy/diff-so-fancy hash diff-so-fancy >/dev/null 2>&1 && set forgit_fancy '|diff-so-fancy' # https://github.com/wfxr/emoji-cli diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index 0b9e66e..6b00215 100755 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -1,10 +1,10 @@ # MIT (c) Wenxuan Zhang -hash fzf > /dev/null 2>&1 || {echo "FZF not found and is requried for forgit" && return 1} - forgit::warn() { printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$@" >&2; } forgit::info() { printf "%b[Info]%b %s\n" '\e[0;32m' '\e[0m' "$@" >&2; } forgit::inside_work_tree() { git rev-parse --is-inside-work-tree >/dev/null; } +hash fzf &>/dev/null || {forgit::warn "FZF not found and is requried for forgit" && return 1} + # https://github.com/so-fancy/diff-so-fancy hash diff-so-fancy &>/dev/null && forgit_fancy='|diff-so-fancy' # https://github.com/wfxr/emoji-cli