Move /etc/skel/.bash* files from baselayout to bash.

Package-Manager: portage-2.0.51.20-r5

6 files changed, 68 insertions, 4 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index a3adc8c820e3..4f3fe85285af 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.61 2005/04/29 22:21:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.62 2005/04/30 00:08:01 vapier Exp $
+
+  30 Apr 2005; Mike Frysinger <vapier@gentoo.org> +files/dot-bash_logout,
+  +files/dot-bash_profile, +files/dot-bashrc, bash-3.0-r11.ebuild:
+  Move /etc/skel/.bash* files from baselayout to bash.
 
 *bash-3.0-r11 (29 Apr 2005)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 21feadd57bf4..3eb4f44ceed6 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,11 +1,11 @@
-MD5 87077c4180483ede3a43e4a30454a2ed ChangeLog 13169
+MD5 7d354bd1dfc6b166b6c3cd30a70c90d3 ChangeLog 13366
 MD5 1c3d1b503b35b4719b1435d83b12a73e bash-2.05b-r11.ebuild 3742
 MD5 017417fc2c09cbaecfe3837baa3e0227 bash-2.05b-r9.ebuild 3531
 MD5 7f7feb247c305544c899366672599232 bash-3.0-r7.ebuild 4060
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 ded385d3c69da943b2f408c18b4c6c21 bash-3.0-r8.ebuild 3949
 MD5 761160a21f9a69be631b044d0be387e5 bash-3.0-r9.ebuild 4267
-MD5 1c25406ba86c6eab1329c12bbb6fbffe bash-3.0-r11.ebuild 4631
+MD5 92aef2540d74a9e204799a00b6a9440e bash-3.0-r11.ebuild 4735
 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
 MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
 MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
@@ -16,6 +16,7 @@ MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
 MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
 MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
+MD5 da9995bff4b3377fe028f3ef95427cd1 files/dot-bash_profile 308
 MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
 MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
 MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
@@ -36,3 +37,5 @@ MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
 MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
 MD5 4af330b479f27337b6e77fff11d6c468 files/bash_logout 132
 MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r9 976
+MD5 b3df3a162a43845cf9f107de9ea6ac27 files/dot-bashrc 1306
+MD5 0387efe97e963a932d870b8f61c5b864 files/dot-bash_logout 240
diff --git a/app-shells/bash/bash-3.0-r11.ebuild b/app-shells/bash/bash-3.0-r11.ebuild
index e59545296390..65629541fb3b 100644
--- a/app-shells/bash/bash-3.0-r11.ebuild
+++ b/app-shells/bash/bash-3.0-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r11.ebuild,v 1.1 2005/04/29 22:21:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r11.ebuild,v 1.2 2005/04/30 00:08:01 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -122,6 +122,10 @@ src_install() {
 
 	insinto /etc/bash
 	doins "${FILESDIR}"/{bashrc,bash_logout}
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
 
 	if use build ; then
 		rm -rf "${D}"/usr
diff --git a/app-shells/bash/files/dot-bash_logout b/app-shells/bash/files/dot-bash_logout
new file mode 100644
index 000000000000..2eb908bfc336
--- /dev/null
+++ b/app-shells/bash/files/dot-bash_logout
@@ -0,0 +1,6 @@
+# /etc/skel/.bash_profile:
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/files/dot-bash_logout,v 1.1 2005/04/30 00:08:01 vapier Exp $
+
+# This file is sourced when a login shell terminates.
+# Clear the screen for security's sake.
+clear
diff --git a/app-shells/bash/files/dot-bash_profile b/app-shells/bash/files/dot-bash_profile
new file mode 100644
index 000000000000..8ae3154ccb21
--- /dev/null
+++ b/app-shells/bash/files/dot-bash_profile
@@ -0,0 +1,7 @@
+# /etc/skel/.bash_profile:
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/files/dot-bash_profile,v 1.1 2005/04/30 00:08:01 vapier Exp $
+
+# This file is sourced by bash for login shells.  The following line
+# runs your .bashrc and is recommended by the bash info pages.
+[[ -f ~/.bashrc ]] && . ~/.bashrc
+
diff --git a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc
new file mode 100644
index 000000000000..bf58f7519fc7
--- /dev/null
+++ b/app-shells/bash/files/dot-bashrc
@@ -0,0 +1,40 @@
+# /etc/skel/.bashrc:
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/files/dot-bashrc,v 1.1 2005/04/30 00:08:01 vapier Exp $
+# 
+# This file is sourced by all *interactive* bash shells on startup,
+# including some apparently interactive shells such as scp and rcp
+# that can't tolerate any output.
+
+
+# Test for an interactive shell.  There is no need to set anything
+# past this point for scp and rcp, and it's important to refrain from
+# outputting anything in those cases.
+if [[ $- != *i* ]]; then
+	# Shell is non-interactive.  Be done now
+	return
+fi
+
+# Shell is interactive.  It is okay to produce output at this point,
+# though this example doesn't produce any.  Do setup for
+# command-line interactivity.
+
+# 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`
+fi
+alias ls="ls --color=auto"
+
+# Change the window title of X terminals 
+case $TERM in
+	xterm*|rxvt|Eterm|eterm)
+		PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"'
+		;;
+	screen)
+		PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"'
+		;;
+esac
+
+# uncomment the following to activate bash-completion:
+#[ -f /etc/profile.d/bash-completion ] && source /etc/profile.d/bash-completion