From 013165a8c465c2a6d1ce411fd662c68994138dc8 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Sat, 21 May 2022 00:17:12 -0400 Subject: [PATCH] ENH don't require colordiff when diff can be colorful itself --- dot_config/zsh/dot_zshrc.tmpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 08edda7..774f235 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -221,6 +221,13 @@ alias uuu='cd ../../..' alias uuuu='cd ../../../..' alias uuuuu='cd ../../../../..' +## diff is weird; only use color if ver >= 3.4 + +diffver="$(diff -v | grep -o '\([0-9]\+\.[0-9]\+\)')" +if [ ${diffver//\.*/} -ge 3 ] && [ ${diffver//*\./} -ge 4 ]; then + alias diff='diff --color' +fi + ## don't assume the rest of these will exist alias_if grep \ @@ -230,7 +237,6 @@ alias_if grep \ alias_if sudo sudo='sudo ' -alias_if_else colordiff diff=colordiff 'diff --color' if ! alias_if exa \ ll='exa -alhg --group-directories-first' \