Better debug logging, display when script really starts

[ConfigScripts.git] / user / bashrc

diff --git a/user/bashrc b/user/bashrc
index 58ad4eeeacd45e37c885c55ace7eec85b36b1f77..ce7fd8d10ef6046e875af8e19a5df5a840d726bb 100644 (file)
--- a/user/bashrc
+++ b/user/bashrc
@@ -1,58 +1,24 @@
 #
 # ~/.bashrc: executed by bash(1) for non-login shells.
+# Written 2006-2009 by Alexander Barton (alex@barton.de)
 #
-# 2008-08-07, alex@barton.de
-#  - Code cleanup, moved parts to /etc/[bash.]bashrc
-# 2006-01-08, alex@barton.de
-#  - Initial version.
+# This script is read in by interactive bash shells, called manually or
+# as login shells (the latter is implemented by sourcing this file from
+# the ~/.bash_profile file).
+#
+# PLEASE NOTE:
+# To make this script generic, it sources ~/bashrc.user if it exists.
+# So you shouldn't make changes to this script, but create your own
+# individual ~/bashrc.user file!
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> ~/.bashrc ..."
+[ -e ~/.ConfigScripts.debug ] && echo " .. ~/.bashrc ..."
 
-[ -z "$BASHRCREAD" -a -r /etc/bash.bashrc ] && source /etc/bash.bashrc
+[ -r ~/.bashrc.user-1st ] && source ~/.bashrc.user-1st
+[ -z "$BASHRCREAD" -a -r ~/.etc/bashrc ] && source ~/.etc/bashrc
 [ -z "$BASHRCREAD" -a -r /etc/bashrc ] && source /etc/bashrc
+[ -r ~/.bashrc.user ] && source ~/.bashrc.user
 
-# aptitude
-type -p aptitude >/dev/null 2>&1
-[ $? -eq 0 ] && alias aptitude="LC_ALL=C sudo aptitude"
-
-# btdownload
-type -p btdownloadcurses >/dev/null 2>&1
-[ $? -eq 0 ] && alias "btdownloadcurses"="btdownloadcurses --max_upload_rate 16"
-
-# ccache
-[ -d "/usr/lib/ccache" ] && PATH="/usr/lib/ccache:$PATH"
-
-# dpkg-buildpackage
-type -p dpkg-buildpackage >/dev/null 2>&1
-[ $? -eq 0 ] && alias dpkg-buildpackage="dpkg-buildpackage -kC24A0F637E364856"
-
-# gitk
-type -p gitk >/dev/null 2>&1
-[ $? -eq 0 ] && alias gitk="gitk 2>/dev/null"
-
-# screen
-type -p screen >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-        alias "s"="screen"
-        alias "sr"="screen -dr"
-        alias "sx"="screen -x"
-       type -p irssi >/dev/null 2>&1
-        [ $? -eq 0 ] && alias "si"="screen irssi"
-fi
-
-# slrn
-type -p cleanscore >/dev/null 2>&1
-[ $? -eq 0 ] && alias slrn="cleanscore -f ~/.slrnscore && slrn"
-
-alias bblack="ssh arthur.barton.de sudo blacklist"
-alias pingblack="ssh gw1-0.fr.pingnet.de sudo blacklist"
-
-BLACK() {
-       echo " --- Arthur.Barton.DE ---"
-       bblack $*
-       echo " --- GW1-0.FR.PingNet.DE ---"
-       pingblack $*
-}
+[ -e ~/.ConfigScripts.debug ] && echo " >> ~/.bashrc ..."
 
 # -eof-