commit: a70b06857fc83ef6f85a6c06b3478c0c25ec8fda
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 22:11:11 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 18:51:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70b0685
app-shells/bash: bashrc: avoid always exporting default LS_COLORS
We've long been exporting the LS_COLORS variable to the default env,
but in practice, there's no reason to be doing this in the majority
of cases. The value we most often load is equivalent to the default
which means we're polluting the env and adding overhead for no gain.
Add a little more code (and one extra `dircolors` exec unfortunately)
to check to see if the LS_COLORS value we found is the default. If
so, don't bother exporting it anymore.
app-shells/bash/files/bashrc | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 414f848..1107f43 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -58,13 +58,37 @@ if type -P dircolors >/dev/null ; then
# Enable colors for ls, etc. Prefer ~/.dir_colors #64489
LS_COLORS=
if [[ -f ~/.dir_colors ]] ; then
+ # If you have a custom file, chances are high that it's not the
default.
+ used_default_dircolors="no"
eval "$(dircolors -b ~/.dir_colors)"
elif [[ -f /etc/DIR_COLORS ]] ; then
+ # People might have customized the system database.
+ used_default_dircolors="maybe"
eval "$(dircolors -b /etc/DIR_COLORS)"
else
+ used_default_dircolors="yes"
eval "$(dircolors -b)"
fi
- [[ -n ${LS_COLORS:+set} ]] && use_color=true
+ if [[ -n ${LS_COLORS:+set} ]] ; then
+ use_color=true
+
+ # The majority of systems out there do not customize these
files, so we
+ # want to avoid always exporting the large $LS_COLORS variable.
This
+ # keeps the active env smaller, and it means we don't have to
deal with
+ # running new/old (incompatible) versions of `ls` compared to
when we
+ # last sourced this file.
+ case ${used_default_dircolors} in
+ no) ;;
+ yes) unset LS_COLORS ;;
+ *)
+ ls_colors=$(eval "$(dircolors -b)"; echo "${LS_COLORS}")
+ if [[ ${ls_colors} == "${LS_COLORS}" ]] ; then
+ unset LS_COLORS
+ fi
+ ;;
+ esac
+ fi
+ unset used_default_dircolors
else
# Some systems (e.g. BSD & embedded) don't typically come with
# dircolors so we need to hardcode some terminals in here.
