From 61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93 Mon Sep 17 00:00:00 2001 From: DZ84 <34625140+DZ84@users.noreply.github.com> Date: Tue, 3 Nov 2020 17:59:18 +0100 Subject: [PATCH] [fzf#vim#with_preview] Incorporate batcat name (#1159) * Added detection/selection of two bat install scenarios. --- bin/preview.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/preview.sh b/bin/preview.sh index 13bc142..08a8c07 100755 --- a/bin/preview.sh +++ b/bin/preview.sh @@ -39,8 +39,15 @@ if [ -z "$CENTER" ]; then CENTER=0 fi -if [ -z "$FZF_PREVIEW_COMMAND" ] && command -v bat > /dev/null; then - bat --style="${BAT_STYLE:-numbers}" --color=always --pager=never \ +# Sometimes bat is installed as batcat. +if command -v batcat > /dev/null; then + BATNAME="batcat" +elif command -v bat > /dev/null; then + BATNAME="bat" +fi + +if [ -z "$FZF_PREVIEW_COMMAND" ] && [ "${BATNAME:+x}" ]; then + ${BATNAME} --style="${BAT_STYLE:-numbers}" --color=always --pager=never \ --highlight-line=$CENTER "$FILE" exit $? fi