From ed0e0d844193c314cc1911281caf3b70b231177a308a8a2ea5355f4576c285eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 5 May 2020 04:41:29 +0000 Subject: [PATCH] - Add back LS_COLORS and LS_OPTIONS OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=223 --- zsh.changes | 5 +++++ zshrc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/zsh.changes b/zsh.changes index b2ca0f3..47c0bb1 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 5 04:41:08 UTC 2020 - Ismail Dönmez + +- Add back LS_COLORS and LS_OPTIONS + ------------------------------------------------------------------- Wed Apr 15 09:02:14 UTC 2020 - Ismail Dönmez diff --git a/zshrc b/zshrc index 80e8d3b..d3c7b01 100644 --- a/zshrc +++ b/zshrc @@ -267,5 +267,42 @@ alias unmount='echo "Error: Try the command: umount" 1>&2; false' alias which-command=whence alias you='if test "$EUID" = 0 ; then /sbin/yast2 online_update ; else su - -c "/sbin/yast2 online_update" ; fi' +# +# Colored file listings +# +if test -x /usr/bin/dircolors ; then + # + # set up the color-ls environment variables: + # + if test -f $HOME/.dir_colors ; then + eval "`/usr/bin/dircolors -b $HOME/.dir_colors`" + elif test -f /etc/DIR_COLORS ; then + eval "`/usr/bin/dircolors -b /etc/DIR_COLORS`" + fi +fi + +# ls color option depends on the terminal +# If LS_COLORS is set but empty, the terminal has no colors. +# +if test "${LS_COLORS+empty}" = "${LS_COLORS:+empty}" ; then + LS_OPTIONS=--color=tty +else + LS_OPTIONS=--color=none +fi + +if test "$UID" = 0 ; then + LS_OPTIONS="-A -N $LS_OPTIONS -T 0" +else + LS_OPTIONS="-N $LS_OPTIONS -T 0" +fi + +# +# Avoid trouble with Emacs shell mode +# +if test "$EMACS" = "t" ; then + LS_OPTIONS='-N --color=none -T 0'; +fi +export LS_OPTIONS + # Read custom system-wide config if exists test -s /etc/zsh.zshrc.local && . /etc/zsh.zshrc.local