tweak comments, touchup syntax, and in general tweak

Package-Manager: portage-2.0.51.22-r2

6 files changed, 32 insertions, 33 deletions

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 28d82354f7e4..b264d3ef87e9 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -14,18 +14,18 @@ MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
 MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
 MD5 b518c92ffb4ee61be7e4b1d27264a652 files/bash-3.0-pgrp-pipe-fix.patch 462
 MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
-MD5 4af330b479f27337b6e77fff11d6c468 files/bash_logout 132
+MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205
 MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
 MD5 ccc195288edb06eb44f4d5e2a9c1da62 files/bash-3.0-crash.patch 1191
 MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
 MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
 MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
-MD5 ba21ebb9f0178d87231a646f39a4ff42 files/bashrc 1627
+MD5 addd22b9c7174a5220a350dc84cb738f files/bashrc 1680
 MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
-MD5 0387efe97e963a932d870b8f61c5b864 files/dot-bash_logout 240
-MD5 ac9be9df250f48c53e922308b903631f files/dot-bashrc 1301
+MD5 7d8a8ef90c1818a0cd66808ac2740638 files/dot-bash_logout 127
+MD5 6dcc418c7812b5f8ebf2f6562eb2e57c files/dot-bashrc 983
 MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
-MD5 da9995bff4b3377fe028f3ef95427cd1 files/dot-bash_profile 308
+MD5 d76b9aa6b733175df21c2bb6afe8900d files/dot-bash_profile 193
 MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
 MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
 MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
@@ -45,7 +45,7 @@ MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC2DwHgIKl8Uu19MoRAgFWAKCCgx12nxRkgNO0GuQiWOjA2S3xZACfc9l3
-L516Nd7/i1TXO1OhZEG2gAI=
-=Um1c
+iD8DBQFC4Dj0gIKl8Uu19MoRAhDOAJ9CgcRwLPVZgqaPjrSs66fdbqLZigCePXuv
+1/eBNyTgf63cVizmM6cLlXM=
+=TYDJ
 -----END PGP SIGNATURE-----
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