Move __ps1 call from .bash_profile to ps1.bashrc.

Don't force __ps1 to be called from .bash_profile.  Anyone cloning the
repository should be free to discard the prompt changes.

diff --git a/.bash_profile b/.bash_profile
index d2f4fc6..39276b9 100644 (file)
--- a/.bash_profile
+++ b/.bash_profile
@@ -20,5 +20,4 @@ if tty -s || [ "${0:0:1}" = "-" -o "$1" = "force" ]; then
   LC_ALL=$lc_all
 
   unset lc_all nocg
-  __ps1
 fi

diff --git a/.profile.d/ps1.bashrc b/.profile.d/ps1.bashrc
index b65e42d..aa750a0 100644 (file)
--- a/.profile.d/ps1.bashrc
+++ b/.profile.d/ps1.bashrc
@@ -1,5 +1,4 @@
 #!bash Coloured prompts.
-# To use, add a call to __ps1 in your .bash_profile file.
 #
 # The prompt comprises multiple parts, some of which may be hidden by unsetting 
 # shell variables or using the ``prompt'' function.
@@ -162,3 +161,5 @@ function prompt() {
   what="$(echo $2 | env LANG= LC_ALL= LC_CTYPE= tr '[:upper:]' '[:lower:]')"
   eval __ps1_$what=$action
 }
+
+__ps1