sys/profile, user/bash_profile: code cleanup

- use ~/.ConfigScripts.debug as debug mode trigger,
- read in ~/.bash_profile.user
- eliminate a log of too specific code from user/bash_profile.

diff --git a/sys/profile b/sys/profile
index c306713bf607760e18d4d2d64d6a2aff6cc32c65..9920eb12d028a600e7c3fab88c42d43464784ea5 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -4,7 +4,7 @@
 # Written 2003-2009 by Alexander Barton (alex@barton.de)
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> /etc/profile ..."
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
 
 PROFILEREAD="true"
 export PROFILEREAD
@@ -95,7 +95,7 @@ fi
 [ "$KSH_VERSION" -a -z "$KSHRCREAD" -a -r /etc/ksh.kshrc ] \
        && . /etc/ksh.kshrc
 
-# Check quotas
+# Check filesystem quotas
 which quota >/dev/null 2>&1
 [ $? -eq 0 ] && quota -q
 

diff --git a/user/bash_profile b/user/bash_profile
index 9d237dd7e9f7c7009ddc54bb030b2d7e3777e7a5..554658b753f6722574ca402ed54e6c1e07dfd728 100644 (file)
--- a/user/bash_profile
+++ b/user/bash_profile
@@ -1,29 +1,19 @@
 #
 # ~/.bash_profile: executed by bash(1) for login shells.
-# Written 2003-2008 by Alexander Barton (alex@barton.de)
+# Written 2003-2009 by Alexander Barton (alex@barton.de)
+#
+# This script is read in by bash login shells.
+#
+# PLEASE NOTE:
+# To make this script generic, it sources ~/bash_profile.user if it exists.
+# So you shouldn't make changes to this script, but create your own
+# individual ~/bash_profile.user file!
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> ~/.bash_profile ..."
-
-[ -z "$PROFILEREAD" -a -r $HOME/.etc/profile ] && source $HOME/.etc/profile
-
-[ -n "$LANG" ] || export LANG="de_DE.ISO8859-1"
-export LC_MESSAGES="C"
-export EMAIL="alex@barton.de"
-export WWW_HOME="http://barton.de/"
-export NNTPSERVER="news.individual.de"
-export CVS_RSH=ssh
-
-[ "$OSTYPE" != "Aux" ] && ulimit -c 2048
-
-if [ -z "$XAUTHORITY" -a -r $HOME/.Xauthority ]; then
-       cp $HOME/.Xauthority /tmp/Xauthority-$USER
-       chmod 600 /tmp/Xauthority-$USER
-       export XAUTHORITY="/tmp/Xauthority-$USER"
-fi
+[ -e ~/.ConfigScripts.debug ] && echo " >> ~/.bash_profile ..."
 
-if [ -f ~/.bashrc ]; then
-       . ~/.bashrc
-fi
+[ -z "$PROFILEREAD" -a -r ~/.etc/profile ] && source ~/.etc/profile
+[ -r ~/.bash_profile.user ] && source ~/.bash_profile.user
+[ -r ~/.bashrc ] && source ~/.bashrc
 
 # -eof-