summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-01-05 11:36:07 +0000
committerRoy Marples <uberlord@gentoo.org>2007-01-05 11:36:07 +0000
commit05e3389b81884aa1881c23c8c552d83b0fb9e706 (patch)
treee0583578d24cb332524e14a000670137c6b5599f /app-shells/bash
parentFixed regression of bug #159457 reported on IRC by "drehrumbum". (diff)
downloadgentoo-2-05e3389b81884aa1881c23c8c552d83b0fb9e706.tar.gz
gentoo-2-05e3389b81884aa1881c23c8c552d83b0fb9e706.tar.bz2
gentoo-2-05e3389b81884aa1881c23c8c552d83b0fb9e706.zip
Fix support for BSD systems.
(Portage version: 2.1.2_rc4-r6)
Diffstat (limited to 'app-shells/bash')
-rw-r--r--app-shells/bash/ChangeLog5
-rw-r--r--app-shells/bash/files/bashrc5
2 files changed, 7 insertions, 3 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 512d90911732..ca0e4c720a2e 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-shells/bash
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.130 2007/01/04 23:44:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.131 2007/01/05 11:36:07 uberlord Exp $
+
+ 05 Jan 2007; Roy Marples <uberlord@gentoo.org> files/bashrc:
+ Fix support for BSD systems.
04 Jan 2007; Mike Frysinger <vapier@gentoo.org> files/bashrc:
Add more support for BSD systems.
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index be1bec629c88..8e9bc0198456 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -32,8 +32,10 @@ case ${TERM} in
PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"'
;;
esac
+
+use_color=false
#BSD#@# BSD doesn't typically come with dircolors so we need
-#BSD#@# to be lame and hardcode some terminals in here.
+#BSD#@# to hardcode some terminals in here.
#BSD#@case ${TERM} in
#BSD#@ xterm*|rxvt*|Eterm|aterm|kterm|gnome|screen|cons25) use_color=true;;
#BSD#@esac
@@ -43,7 +45,6 @@ esac
# instead of using /etc/DIR_COLORS. Try to use the external file
# first to take advantage of user additions. Use internal bash
# globbing instead of external grep binary.
-use_color=false
safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
match_lhs=""
[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"