aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-01-06 14:47:30 +0100
committerMartin Polden <mpolden@mpolden.no>2023-01-06 14:49:13 +0100
commitf517401379ea8ddfb5c6e5fe28d69f8eb06a3de0 (patch)
tree88ed918a10b60b9864c1308016bcfd42a79335d3
parent6fe91cd935863192776649cddf1b2f1c673ad3e9 (diff)
zsh: simplify diff --color check
-rw-r--r--zsh_aliases8
1 files changed, 3 insertions, 5 deletions
diff --git a/zsh_aliases b/zsh_aliases
index b30ae1b..3b5854e 100644
--- a/zsh_aliases
+++ b/zsh_aliases
@@ -72,11 +72,9 @@ function brew-fzf {
# Alias diff
function alias-diff {
- local -r diff_path="$(whence diff)"
- if [[ "$OSTYPE" == "linux-gnu" || "$diff_path" == "/usr/local/bin/diff" ]]; then
- # Modern GNU diff. macOS ships with an older diff which doesn't support
- # --color
- alias diff='diff --color=auto'
+ # Use colors in diff output when supported
+ if diff --color=auto /dev/null /dev/null 2> /dev/null; then
+ alias diff='diff --color=auto'
fi
}