diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-07-20 02:18:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-07-20 02:18:12 +0000 |
| commit | ead36b602c6498a2e54247c1b9fb6c89feac00b7 (patch) | |
| tree | 2c3a9d195f2e40f3bdc61087b58b468b66853795 /app-shells | |
| parent | dont install into /usr/man (diff) | |
| download | gentoo-2-ead36b602c6498a2e54247c1b9fb6c89feac00b7.tar.gz gentoo-2-ead36b602c6498a2e54247c1b9fb6c89feac00b7.tar.bz2 gentoo-2-ead36b602c6498a2e54247c1b9fb6c89feac00b7.zip | |
Only run dircolors on /etc/DIR_COLORS if /etc/DIR_COLORS exists #140628.
(Portage version: 2.1.1_pre3-r1)
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/ChangeLog | 5 | ||||
| -rw-r--r-- | app-shells/bash/files/dot-bashrc | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 2b01404b7ccd..abcc21d41e08 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-shells/bash # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.104 2006/07/16 03:55:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.105 2006/07/20 02:18:12 vapier Exp $ + + 20 Jul 2006; Mike Frysinger <vapier@gentoo.org> files/dot-bashrc: + Only run dircolors on /etc/DIR_COLORS if /etc/DIR_COLORS exists #140628. 16 Jul 2006; Mike Frysinger <vapier@gentoo.org> files/bash-3.0-bash-logger.patch, files/bash-3.1-bash-logger.patch: diff --git a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc index a85c857c46bf..28b9cc4e1bff 100644 --- a/app-shells/bash/files/dot-bashrc +++ b/app-shells/bash/files/dot-bashrc @@ -1,4 +1,4 @@ -# /etc/skel/.bashrc: +# /etc/skel/.bashrc # # This file is sourced by all *interactive* bash shells on startup, # including some apparently interactive shells such as scp and rcp @@ -15,10 +15,10 @@ if [[ $- != *i* ]] ; then fi # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 -if [[ -f ~/.dir_colors ]]; then - eval `dircolors -b ~/.dir_colors` -else - eval `dircolors -b /etc/DIR_COLORS` +if [[ -f ~/.dir_colors ]] ; then + eval $(dircolors -b ~/.dir_colors) +elif [[ -f /etc/DIR_COLORS ]] ; then + eval $(dircolors -b /etc/DIR_COLORS) fi alias ls='ls --color=auto' |