Merge the dot bashrc and global bashrc #148812 by Sebastian Rijkers.

Package-Manager: portage-2.1.2_rc4-r2

4 files changed, 44 insertions, 43 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 7c4c56a2a054..25cbdff7b357 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2006/12/16 03:07:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.127 2006/12/30 01:50:23 vapier Exp $
+
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/bashrc,
+  files/dot-bashrc:
+  Merge the dot bashrc and global bashrc #148812 by Sebastian Rijkers.
 
 *bash-3.2_p9 (16 Dec 2006)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 7faa50e898b1..f02ee85a185c 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -193,10 +193,10 @@ AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a698366
 MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205
 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 files/bash_logout 205
 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d files/bash_logout 205
-AUX bashrc 1912 RMD160 b57e5fc16bb2ffefdec81f59f2304f103c680715 SHA1 e3ce2f67542db62ef166cec2a7739c5c49d16aa1 SHA256 740578369b2492351f3b87dfe13376070c4b79f3f8d691650baf60a1b95ac135
-MD5 b6a389f03ac16e9f200d6725757c6ff1 files/bashrc 1912
-RMD160 b57e5fc16bb2ffefdec81f59f2304f103c680715 files/bashrc 1912
-SHA256 740578369b2492351f3b87dfe13376070c4b79f3f8d691650baf60a1b95ac135 files/bashrc 1912
+AUX bashrc 2484 RMD160 373d402f43bc46a473dde075a855f5cd10ad1f4e SHA1 88277fd12149838c06cd529c3401ad781c149ec8 SHA256 c92a176a66f14966b4d455c2b742957f588b6d99639c39b2924e977f3b7ed333
+MD5 c719a4674586c0d017afc2b9a8186d20 files/bashrc 2484
+RMD160 373d402f43bc46a473dde075a855f5cd10ad1f4e files/bashrc 2484
+SHA256 c92a176a66f14966b4d455c2b742957f588b6d99639c39b2924e977f3b7ed333 files/bashrc 2484
 AUX dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 SHA1 9e1e6e03b033fdfcf9f2098324bac5754c26ec69 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022
 MD5 7d8a8ef90c1818a0cd66808ac2740638 files/dot-bash_logout 127
 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 files/dot-bash_logout 127
@@ -205,10 +205,10 @@ AUX dot-bash_profile 193 RMD160 7ee4f60be78b1b46c5142f081d978c09700f6322 SHA1 1c
 MD5 d76b9aa6b733175df21c2bb6afe8900d files/dot-bash_profile 193
 RMD160 7ee4f60be78b1b46c5142f081d978c09700f6322 files/dot-bash_profile 193
 SHA256 ae12206aaa35dc96273ed421f4e85ca26a1707455e3cc9f054c7f5e2e9c53df6 files/dot-bash_profile 193
-AUX dot-bashrc 1100 RMD160 c9ed72b1b8c94bb2db744408adbcb9d0eebfae98 SHA1 8a280f559afe59d06637ba5b78b58e86bd48dd21 SHA256 52d6c06c9cf12ea5523f720ab5d83e6445fe3d76278460e5d4ea627d14a36c09
-MD5 ee8c9e0b9d01becf883c65d80361fd1e files/dot-bashrc 1100
-RMD160 c9ed72b1b8c94bb2db744408adbcb9d0eebfae98 files/dot-bashrc 1100
-SHA256 52d6c06c9cf12ea5523f720ab5d83e6445fe3d76278460e5d4ea627d14a36c09 files/dot-bashrc 1100
+AUX dot-bashrc 551 RMD160 ab24b2c9936d008824c419206336597973e2bae9 SHA1 e3db8ebd3a60c88cba7e18af120cff26368c84e9 SHA256 e280e34af6e830c93adb6285f66ead4812ddfb2bbc6a7ff618467f4c933f6446
+MD5 d210b9cd7fc07420736480f2062d7d7f files/dot-bashrc 551
+RMD160 ab24b2c9936d008824c419206336597973e2bae9 files/dot-bashrc 551
+SHA256 e280e34af6e830c93adb6285f66ead4812ddfb2bbc6a7ff618467f4c933f6446 files/dot-bashrc 551
 DIST bash-2.05b-gentoo.diff.bz2 2744 RMD160 57ee5517dd6af459eacc7f0e6250ef4757ea40d6 SHA1 bf759941f4f06ea325e0b94b59bdf89b6a4ef708 SHA256 b2722b73d442ce678ea98f04a53fe5aa8b7f69797b198ff5151b6b897e1f324c
 DIST bash-2.05b.tar.gz 1956216 RMD160 d9826db03c5d38e6175af5b3ef0bc07fafa14add SHA1 b3e158877f94e66ec1c8ef604e994851ee388b09 SHA256 ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4
 DIST bash-3.0-gentoo.diff.bz2 2423 RMD160 133b6338fd320b9cac0cddeeafff27680c8d8a17 SHA1 d13eaa166c8fce9607213ccbf204d8741a38b047 SHA256 13b0c1e426914093b7fcbc57e4901945512ebc73f737f21a01e150843a699a84
@@ -296,10 +296,10 @@ EBUILD bash-3.2_p9.ebuild 4349 RMD160 6ae9a6429ac83712e557346bc03e9058b326183d S
 MD5 6a5b3c847e3c85dcd5599d35bb53ea33 bash-3.2_p9.ebuild 4349
 RMD160 6ae9a6429ac83712e557346bc03e9058b326183d bash-3.2_p9.ebuild 4349
 SHA256 2f929739750214c01b34c4d936cdff7427db23e496e820a1de696233ba7489b3 bash-3.2_p9.ebuild 4349
-MISC ChangeLog 22492 RMD160 87ca01eb8ef763977695a25f1064fe67922dcf92 SHA1 305bc3492b0b98aec701b40bc4c46987acaf49ed SHA256 5df524ee37f2302c28aaad0b2362a62a2f0091c4359454f5cffc9fce23515bca
-MD5 86684d60d5309918b8cd653946d017d7 ChangeLog 22492
-RMD160 87ca01eb8ef763977695a25f1064fe67922dcf92 ChangeLog 22492
-SHA256 5df524ee37f2302c28aaad0b2362a62a2f0091c4359454f5cffc9fce23515bca ChangeLog 22492
+MISC ChangeLog 22648 RMD160 386659a25e727b68b3a344b7ca3f992e9e0e3653 SHA1 4c13c701c82d843d225d0dd81a1dc2cd7e5e1684 SHA256 c2a332033c49dd0d6d93cd206347f49ea208c8f9e742270cf68ef6a50424509a
+MD5 500b0781311d66aed416efa133c3501c ChangeLog 22648
+RMD160 386659a25e727b68b3a344b7ca3f992e9e0e3653 ChangeLog 22648
+SHA256 c2a332033c49dd0d6d93cd206347f49ea208c8f9e742270cf68ef6a50424509a ChangeLog 22648
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -329,9 +329,9 @@ MD5 ef1b3c02b997284cb562ba9e3eebf17c files/digest-bash-3.2_p9 2074
 RMD160 3232387aa160a9ea2ee764e929fa58618674d590 files/digest-bash-3.2_p9 2074
 SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/digest-bash-3.2_p9 2074
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFg2RLK9sYciBdMQMRAnv6AKCHtKsl/dp547F70oOtF1W0ev6AjQCfQrWp
-mrT68SQEJNfTA3lah3pbUJ0=
-=D4bu
+iD8DBQFFlcYd8bi6rjpTunYRApDAAJ91+ue5MwC7KqwHYDsD6Gz0xotQSQCfd+js
+cBN9Qf6TmbNnWq6cNiZgYHA=
+=jr5g
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index dedbbf5e5a99..b6fee4df9e22 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -30,22 +30,27 @@ shopt -s histappend
 # globbing instead of external grep binary.
 use_color=false
 safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
-if [[ -f /etc/DIR_COLORS ]] ; then
-	match_lhs=$(</etc/DIR_COLORS)
-elif type -p dircolors >/dev/null ; then
-	match_lhs=$(dircolors --print-database)
-else
-	match_lhs=""
-fi
+match_lhs=""
+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
+[[ -z ${match_lhs}    ]] && match_lhs=$(dircolors --print-database)
 [[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
 
 if ${use_color} ; then
+	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+	if [[ -f ~/.dir_colors ]] ; then
+		eval $(dircolors -b ~/.dir_colors)
+	elif [[ -f /etc/DIR_COLORS ]] ; then
+		eval $(dircolors -b /etc/DIR_COLORS)
+	fi
+
 	if [[ ${EUID} == 0 ]] ; then
 		PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
 	else
 		PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
 	fi
 
+	#BSD#@export CLICOLOR=1
 	#GNU#@alias ls='ls --color=auto'
 	alias grep='grep --colour=auto'
 else
@@ -59,3 +64,13 @@ fi
 
 # Try to keep environment pollution down, EPA loves us.
 unset use_color safe_term match_lhs
+
+# Change the window title of X terminals 
+case ${TERM} in
+	xterm*|rxvt*|Eterm|aterm|kterm|gnome)
+		PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"'
+		;;
+	screen)
+		PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"'
+		;;
+esac
diff --git a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc
index 0211a6b72b9e..34dbd8c892f6 100644
--- a/app-shells/bash/files/dot-bashrc
+++ b/app-shells/bash/files/dot-bashrc
@@ -14,23 +14,5 @@ if [[ $- != *i* ]] ; then
 	return
 fi
 
-# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
-if [[ -f ~/.dir_colors ]] ; then
-	eval $(dircolors -b ~/.dir_colors)
-elif [[ -f /etc/DIR_COLORS ]] ; then
-	eval $(dircolors -b /etc/DIR_COLORS)
-fi
-
-#BSD#@export CLICOLOR=1
-#GNU#@alias ls='ls --color=auto'
-alias grep='grep --colour=auto'
 
-# Change the window title of X terminals 
-case ${TERM} in
-	xterm*|rxvt*|Eterm|aterm|kterm|gnome)
-		PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"'
-		;;
-	screen)
-		PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"'
-		;;
-esac
+# Put your fun stuff here.