tweak comments, touchup syntax, and in general tweak

(Portage version: 2.0.51.22-r2)

5 files changed, 24 insertions, 25 deletions

diff --git a/app-shells/bash/files/bash_logout b/app-shells/bash/files/bash_logout
index 2290669ff99e..50a79331c08e 100644
--- a/app-shells/bash/files/bash_logout
+++ b/app-shells/bash/files/bash_logout
@@ -1,4 +1,9 @@
 # /etc/bash/bash_logout
-# $Id: bash_logout,v 1.1 2005/04/29 04:16:38 vapier Exp $
 
-# this file is executed when a login shell exits
+# This file is sourced when a login shell terminates.
+
+# You may wish to clear everyone's screen when they logout.
+#clear
+
+# Or maybe you want to leave a thoughtful note.
+#fortune
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index ba468587f5bb..fa3103e312a1 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -1,16 +1,16 @@
-# /etc/bash.bashrc:
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/files/bashrc,v 1.7 2005/07/15 22:41:48 vapier Exp $
-# 
+# /etc/bash/bashrc
+#
 # 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.
+# that can't tolerate any output.  So make sure this doesn't display
+# anything or bad things will happen !
 
 
 # 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
+	# Shell is non-interactive.  Be done now!
 	return
 fi
 
@@ -49,3 +49,6 @@ else
 		PS1='\u@\h \w \$ '
 	fi
 fi
+
+# Try to keep environment pollution down, EPA loves us.
+unset use_color safe_term
diff --git a/app-shells/bash/files/dot-bash_logout b/app-shells/bash/files/dot-bash_logout
index 2eb908bfc336..44b6f79ca8eb 100644
--- a/app-shells/bash/files/dot-bash_logout
+++ b/app-shells/bash/files/dot-bash_logout
@@ -1,6 +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 $
+# /etc/skel/.bash_logout
 
 # 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
index 8ae3154ccb21..94a6622b5c67 100644
--- a/app-shells/bash/files/dot-bash_profile
+++ b/app-shells/bash/files/dot-bash_profile
@@ -1,7 +1,5 @@
-# /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 $
+# /etc/skel/.bash_profile
 
 # 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
index 78ab5d2adda3..db805d7e8c9a 100644
--- a/app-shells/bash/files/dot-bashrc
+++ b/app-shells/bash/files/dot-bashrc
@@ -1,24 +1,20 @@
 # /etc/skel/.bashrc:
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/files/dot-bashrc,v 1.3 2005/07/06 22:10:22 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.
+# that can't tolerate any output.  So make sure this doesn't display
+# anything or bad things will happen !
 
 
 # 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
+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
+# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
 if [[ -f ~/.dir_colors ]]; then
 	eval `dircolors -b ~/.dir_colors`
 else
@@ -35,6 +31,3 @@ case $TERM in
 		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