diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-06-23 02:01:29 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-06-23 02:01:32 -0400 |
| commit | e034ed6fa7205737661467cc148fadba79d7fec8 (patch) | |
| tree | 5f5bfe97d133a77cf7e1242e078e7bee67c6d8ee /app-shells | |
| parent | app-shells/bash: version bump to 4.3_p46 (diff) | |
| download | gentoo-e034ed6fa7205737661467cc148fadba79d7fec8.tar.gz gentoo-e034ed6fa7205737661467cc148fadba79d7fec8.tar.bz2 gentoo-e034ed6fa7205737661467cc148fadba79d7fec8.zip | |
app-shells/bash: bashrc: back out clearing of default LS_COLORS #583814
The behavior of ls in the default case (when LS_COLORS isn't set) isn't
documented well. The manual leads you to believe the defaults will be
used when in reality they are not. A scan of the source shows this. So
back out some the attempts to optimize the env and go back to exporting
LS_COLORS all the time. We'll just have to live with incompat warnings
when coreutils upgrades & changes behavior.
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/files/bashrc | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc index f625657bb15c..6db696681956 100644 --- a/app-shells/bash/files/bashrc +++ b/app-shells/bash/files/bashrc @@ -53,43 +53,29 @@ esac # dircolors --print-database uses its own built-in database # instead of using /etc/DIR_COLORS. Try to use the external file # first to take advantage of user additions. +# We run dircolors directly due to its changes in file syntax and +# terminal name patching. use_color=false 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 + # Note: We always evaluate the LS_COLORS setting even when it's the + # default. If it isn't set, then `ls` will only colorize by default + # based on file attributes and ignore extensions (even the compiled + # in defaults of dircolors). #583814 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 - unset ls_colors - ;; - esac + else + # Delete it if it's empty as it's useless in that case. + unset LS_COLORS 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. |