Enable histappend option by default #139609 by Trenton D. Adams and add small rewrite by Michael A. Smith to use bash builtins instead of grep for detecting term color capabilities #140266.

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 29 insertions, 20 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index abcc21d41e08..8b22d2f354b1 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.105 2006/07/20 02:18:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.106 2006/07/20 06:40:42 vapier Exp $
+
+  20 Jul 2006; Mike Frysinger <vapier@gentoo.org> files/bashrc:
+  Enable histappend option by default #139609 by Trenton D. Adams and add
+  small rewrite by Michael A. Smith to use bash builtins instead of grep for
+  detecting term color capabilities #140266.
 
   20 Jul 2006; Mike Frysinger <vapier@gentoo.org> files/dot-bashrc:
   Only run dircolors on /etc/DIR_COLORS if /etc/DIR_COLORS exists #140628.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 4c5835488d0d..88eed7b46285 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -181,10 +181,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 1680 RMD160 1dfdb7eeff2472d704ba501da788f73bc279df3c SHA1 37fcebfea66e24a01c1a96d0137b451f8bdd3f71 SHA256 1f09fdc8861d1d68753f40391d2f48b984ff4e2a3572742dbd176eb5965f0cce
-MD5 addd22b9c7174a5220a350dc84cb738f files/bashrc 1680
-RMD160 1dfdb7eeff2472d704ba501da788f73bc279df3c files/bashrc 1680
-SHA256 1f09fdc8861d1d68753f40391d2f48b984ff4e2a3572742dbd176eb5965f0cce files/bashrc 1680
+AUX bashrc 1844 RMD160 1089b108112c8a173216d4c59dc2563ef9fb1e53 SHA1 8b89198e0993a9d506278d44484df22fb9391e31 SHA256 6d6c4571455fd8528f075570bc18096bdea6336be1eecbbbddc4e15c55629820
+MD5 77bf3ca6695e6c92a54c4c75beddf7ea files/bashrc 1844
+RMD160 1089b108112c8a173216d4c59dc2563ef9fb1e53 files/bashrc 1844
+SHA256 6d6c4571455fd8528f075570bc18096bdea6336be1eecbbbddc4e15c55629820 files/bashrc 1844
 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
@@ -270,10 +270,10 @@ EBUILD bash-3.1_p17.ebuild 4578 RMD160 304b6f87c4a38d4a73903dcaaabd32abccb1c413
 MD5 b760cd4f22ec95bcbfe14b1fb67c10e8 bash-3.1_p17.ebuild 4578
 RMD160 304b6f87c4a38d4a73903dcaaabd32abccb1c413 bash-3.1_p17.ebuild 4578
 SHA256 30e8f6e2ea986e613e8d47e5b08271439956de0f3519bef7e355f67e415edfd7 bash-3.1_p17.ebuild 4578
-MISC ChangeLog 19831 RMD160 4e2e09542dd96ee299ba1e26cec984ca7525908a SHA1 acbdafec2cee33491b91e347645919d6e423366a SHA256 8f0d78b081e222449709070bab10599407696d15b3fab35c277a5b3cb7e01459
-MD5 2d7a7a5bc71f244652c2cab63983ebc6 ChangeLog 19831
-RMD160 4e2e09542dd96ee299ba1e26cec984ca7525908a ChangeLog 19831
-SHA256 8f0d78b081e222449709070bab10599407696d15b3fab35c277a5b3cb7e01459 ChangeLog 19831
+MISC ChangeLog 20092 RMD160 4b60b8b2b94d6f052f3438571353f9fc10698fce SHA1 46b4b904ebaa4ea0c0655912ca97b8d5123cf318 SHA256 3edf8d46747a863395c6f227bbc483cb5fb473e42dccd88b11022c498c6aa56a
+MD5 382b5e0e3cf001dcb53501e37676c298 ChangeLog 20092
+RMD160 4b60b8b2b94d6f052f3438571353f9fc10698fce ChangeLog 20092
+SHA256 3edf8d46747a863395c6f227bbc483cb5fb473e42dccd88b11022c498c6aa56a ChangeLog 20092
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -302,7 +302,7 @@ SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEvuftamhnQswr0vIRAtaUAJ0aFhDXYI4ZPoR1va3Am01dyg8mlACgrghd
-AtWfhffH8NkisfCbgSl1dXY=
-=womS
+iD8DBQFEvyVyamhnQswr0vIRAliWAJ9UkAfvgCaP2lYfTpkvdMoV/aLs2ACdHgIi
+8+9wsfwa8G7NuFItjAVGJeM=
+=qvVk
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index fa3103e312a1..c4a352484611 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -20,20 +20,24 @@ fi
 # http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
 shopt -s checkwinsize
 
+# Enable history appending instead of overwriting.  #139609
+shopt -s histappend
+
 # Set colorful PS1 only on colorful terminals.
 # 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.
+# 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
-
+safe_term=${TERM//[^[:alnum:]]/.}   # sanitize TERM
 if [[ -f /etc/DIR_COLORS ]] ; then
-	grep -q "^TERM ${safe_term}" /etc/DIR_COLORS && use_color=true
+	match_lhs=$(</etc/DIR_COLORS)
 elif type -p dircolors >/dev/null ; then
-	if dircolors --print-database | grep -q "^TERM ${safe_term}" ; then
-		use_color=true
-	fi
+	match_lhs=$(dircolors --print-database)
+else
+	match_lhs=""
 fi
+[[ $'\n'${match_lhs} == *$'\n'"TERM ${safe_term}"* ]] && use_color=true
 
 if ${use_color} ; then
 	if [[ ${EUID} == 0 ]] ; then
@@ -51,4 +55,4 @@ else
 fi
 
 # Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term
+unset use_color safe_term match_lhs