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 1/3] - 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 From 0770f932c1def6ef13d84c609de78199046271cc62fad8b25c6fd3b66ce31982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 5 May 2020 13:40:11 +0000 Subject: [PATCH 2/3] - OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=224 --- zsh.changes | 2 +- zshrc | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/zsh.changes b/zsh.changes index 47c0bb1..e0c67bf 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue May 5 04:41:08 UTC 2020 - Ismail Dönmez -- Add back LS_COLORS and LS_OPTIONS +- Add back LS_COLORS, LS_OPTIONS and GPG_TTY ------------------------------------------------------------------- Wed Apr 15 09:02:14 UTC 2020 - Ismail Dönmez diff --git a/zshrc b/zshrc index d3c7b01..a273b55 100644 --- a/zshrc +++ b/zshrc @@ -283,7 +283,6 @@ 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 @@ -296,13 +295,18 @@ 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 +# Set GPG_TTY for curses pinentry +# (see man gpg-agent and bnc#619295) +if test -t && type -p tty > /dev/null 2>&1 ; then + GPG_TTY="`tty`" + export GPG_TTY +fi + # Read custom system-wide config if exists test -s /etc/zsh.zshrc.local && . /etc/zsh.zshrc.local From d1788e846562ff6ec1ffc9768956a9cf8918fe90651da052d5ac43ce49ac1306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 6 May 2020 05:17:27 +0000 Subject: [PATCH 3/3] Accepting request 800460 from home:NickLion:shells - Add $HOME aliases to fix regression after dropping /etc/bash.bashrc OBS-URL: https://build.opensuse.org/request/show/800460 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=225 --- zsh.changes | 5 +++++ zshrc | 2 ++ 2 files changed, 7 insertions(+) diff --git a/zsh.changes b/zsh.changes index e0c67bf..aed2d5d 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 5 20:07:10 UTC 2020 - Mykola Krachkovsky + +- Add $HOME aliases to fix regression after dropping /etc/bash.bashrc + ------------------------------------------------------------------- Tue May 5 04:41:08 UTC 2020 - Ismail Dönmez diff --git a/zshrc b/zshrc index a273b55..e18d1cb 100644 --- a/zshrc +++ b/zshrc @@ -267,6 +267,8 @@ 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' +test -s $HOME/.alias && . $HOME/.alias + # # Colored file listings #