From: Michael Prokop <mika@grml.org>
Date: Fri, 3 Dec 2021 09:21:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/130'
X-Git-Tag: v0.19.1~4
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=71d9deccfa42338806229f048f75248859d100a0;hp=f444c52ee3ccb55bb312a074d38484a1b42c26c9;p=grml-etc-core.git

Merge remote-tracking branch 'origin/github/pr/130'
---

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 435334e..8ff4dde 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -2677,6 +2677,11 @@ else
     alias l='command ls -l'
 fi
 
+# use ip from iproute2 with color support
+if ip --color=auto addr >/dev/null 2>&1; then
+    alias ip='command ip --color=auto'
+fi
+
 if [[ -r /proc/mdstat ]]; then
     alias mdstat='cat /proc/mdstat'
 fi
@@ -3308,7 +3313,14 @@ zrcautoload lookupinit && lookupinit
 # variables
 
 # set terminal property (used e.g. by msgid-chooser)
-export COLORTERM="yes"
+case "${COLORTERM}" in
+  truecolor)
+    # do not overwrite
+    ;;
+  *)
+    export COLORTERM="yes"
+    ;;
+esac
 
 # aliases