diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-08-02 18:22:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-08-02 18:22:15 +0000 |
| commit | cf9b6d868a7e3c6886667648657e21df84dc5214 (patch) | |
| tree | 9e6f0a5aaf428e3d1968b14ef8637120ae35964f /app-shells | |
| parent | Stable on sparc (diff) | |
| download | historical-cf9b6d868a7e3c6886667648657e21df84dc5214.tar.gz historical-cf9b6d868a7e3c6886667648657e21df84dc5214.tar.bz2 historical-cf9b6d868a7e3c6886667648657e21df84dc5214.zip | |
simplify the userland stuff and add back in ls/grep aliases in bashrc
Package-Manager: portage-2.1.1_pre4
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/Manifest | 22 | ||||
| -rw-r--r-- | app-shells/bash/bash-3.1_p17.ebuild | 10 | ||||
| -rw-r--r-- | app-shells/bash/files/bashrc | 3 |
3 files changed, 17 insertions, 18 deletions
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 2c359c802699..3d2315617ed7 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 1844 RMD160 27590361dae829e9d80f8b6a3e094016e966fe37 SHA1 cc00602d5771a8362809a1051c1e64b185bf64e8 SHA256 4ff486a25e3daf3b0701a920f6053bc3e1e72594109a1554a3db969ced550f8c -MD5 b4f959f871ee46560d484687d51fd7ef files/bashrc 1844 -RMD160 27590361dae829e9d80f8b6a3e094016e966fe37 files/bashrc 1844 -SHA256 4ff486a25e3daf3b0701a920f6053bc3e1e72594109a1554a3db969ced550f8c files/bashrc 1844 +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 dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 SHA1 9e1e6e03b033fdfcf9f2098324bac5754c26ec69 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 MD5 7d8a8ef90c1818a0cd66808ac2740638 files/dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 files/dot-bash_logout 127 @@ -266,10 +266,10 @@ EBUILD bash-3.1_p16.ebuild 4566 RMD160 3ebf807186a7abc91b63da4d5c0312b69ed991b3 MD5 d9bcc4cb5dc03ca4519d7e651b7727bf bash-3.1_p16.ebuild 4566 RMD160 3ebf807186a7abc91b63da4d5c0312b69ed991b3 bash-3.1_p16.ebuild 4566 SHA256 597cf3ab71774aa33a4cf1670bed6670b7d4a5514cf9ff73c36cac1e74299e8f bash-3.1_p16.ebuild 4566 -EBUILD bash-3.1_p17.ebuild 4722 RMD160 81cffc3106528f0ee4c82a8638866b758f3b17c0 SHA1 7cffa53c35762a888cbf9f57ec24b3112083f9a3 SHA256 1eb619a2c9708693582a06735cc79c1dd369cebc391f78cb00dbb56c19db20f9 -MD5 4111a804dfb53d67ef413ef296ee12a9 bash-3.1_p17.ebuild 4722 -RMD160 81cffc3106528f0ee4c82a8638866b758f3b17c0 bash-3.1_p17.ebuild 4722 -SHA256 1eb619a2c9708693582a06735cc79c1dd369cebc391f78cb00dbb56c19db20f9 bash-3.1_p17.ebuild 4722 +EBUILD bash-3.1_p17.ebuild 4662 RMD160 14127447748bbcb23055de72723a65432d48467c SHA1 842a4d7071ae6fd0ec7e1edddf824a11ce042d37 SHA256 025d0d4cb6ae2d2fd9403d44914461e6e80128bf7fb100d3c92cfd3bc8c22974 +MD5 5a6e27af417eb1d06447550ef9204f1e bash-3.1_p17.ebuild 4662 +RMD160 14127447748bbcb23055de72723a65432d48467c bash-3.1_p17.ebuild 4662 +SHA256 025d0d4cb6ae2d2fd9403d44914461e6e80128bf7fb100d3c92cfd3bc8c22974 bash-3.1_p17.ebuild 4662 MISC ChangeLog 20315 RMD160 eb6f34e53613a09e59955fdca9d9fcef1485a259 SHA1 bebc3551a0d6bc0f5082727c1a050dbd9ba5f9e6 SHA256 382758e48a6a40a63f348ca1e915544b88731a98b9bf07aa3f37fdc4611d18db MD5 dd73e14e164d917bebeddb67f8fb8fa0 ChangeLog 20315 RMD160 eb6f34e53613a09e59955fdca9d9fcef1485a259 ChangeLog 20315 @@ -302,7 +302,7 @@ SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFE0NA9amhnQswr0vIRAoowAJ4o1jw+jUSTEWSGwXnXtuKHQ2jdZwCfWyZW -174X9jHtYoA0vYrkLAPdn3M= -=7Odv +iD8DBQFE0O1namhnQswr0vIRAm4wAJwJuEGZIEZ8lL9FTB4c79MWmGJ04gCgpCvj +5Iyx9yvyTBWK+KTxKADGlSA= +=bCBB -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-3.1_p17.ebuild b/app-shells/bash/bash-3.1_p17.ebuild index 09738e52624a..e874c380b239 100644 --- a/app-shells/bash/bash-3.1_p17.ebuild +++ b/app-shells/bash/bash-3.1_p17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p17.ebuild,v 1.4 2006/08/02 16:17:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p17.ebuild,v 1.5 2006/08/02 18:22:15 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -126,12 +126,8 @@ src_install() { newins "${FILESDIR}"/dot-${f} .${f} done - if use userland_GNU ; then - sed -i -e 's:^#GNU#@::' "${D}"/etc/skel/.bashrc - elif use userland_BSD ; then - sed -i -e 's:^#BSD#@::' "${D}"/etc/skel/.bashrc - fi - sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc + sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc + sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc doman doc/*.1 dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc index 3350e3dcbdc7..dedbbf5e5a99 100644 --- a/app-shells/bash/files/bashrc +++ b/app-shells/bash/files/bashrc @@ -45,6 +45,9 @@ if ${use_color} ; then else PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' fi + + #GNU#@alias ls='ls --color=auto' + alias grep='grep --colour=auto' else if [[ ${EUID} == 0 ]] ; then # show root@ when we don't have colors |