From 505177d58a48012c5cc76ed762ff8f62f827e1211218f871335e18e01d68327f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 8 Apr 2020 06:08:52 +0000 Subject: [PATCH] - Stop sourcing /etc/bash.bashrc which causes problems with ls, add a call to manually source /etc/zsh.zshrc.local if available. OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=219 --- zsh.changes | 6 ++++++ zshrc | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/zsh.changes b/zsh.changes index f7e032e..57bce80 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 8 06:04:06 UTC 2020 - Ismail Dönmez + +- Stop sourcing /etc/bash.bashrc which causes problems with ls, add + a call to manually source /etc/zsh.zshrc.local if available. + ------------------------------------------------------------------- Tue Mar 10 08:38:10 UTC 2020 - Martin Liška diff --git a/zshrc b/zshrc index e2f375f..7307a03 100644 --- a/zshrc +++ b/zshrc @@ -1,7 +1,3 @@ -# read bash.bashrc first for some features we dont want -# to re-implement here -source /etc/bash.bashrc - # Custom completion support via /etc/zsh_completion.d fpath=( $fpath /etc/zsh_completion.d ) @@ -250,3 +246,6 @@ if [[ "$ZSHEDIT" == "emacs" ]] then bindkey "^^[[A" up-history bindkey "^^[[B" down-history fi + +# Read custom system-wide config if exists +test -s /etc/zsh.zshrc.local && . /etc/zsh.zshrc.local