sys/bashrc, user/bashrc: code cleanup

- use ~/.ConfigScripts.debug as debug mode trigger,
- read in ~/.bashrc.user
- move a lot of generic code to sys/bashrc,
- eliminate a log of too specific code from user/bashrc.

diff --git a/sys/bashrc b/sys/bashrc
index 9613137f7fb50a885b3824626da43a103ff49f80..99cd611b924600609d140e8c63b1300d25837eef 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -3,7 +3,7 @@
 # Written 2003-2009 by Alexander Barton (alex@barton.de)
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> /etc/bash.bashrc ..."
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
 
 BASHRCREAD="true"
 
@@ -64,10 +64,30 @@ alias "ll"="ls -l"
 alias "l"="ll -a"
 alias "lasth"="last | head -n \`expr \\\$LINES - 2\`"
 
-# less filter
+# Aliases for screen(1), if installed
+type -p screen >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+       alias "s"="screen"
+       alias "sr"="screen -dr"
+       alias "sx"="screen -x"
+fi
+
+# less(1) filter, if available
 type -p lesspipe >/dev/null 2>&1 && eval `lesspipe`
 
-# Enable color support of ls and also add handy aliases
+# Initialize ccache(1), if installed
+if [ -d "/usr/lib/ccache" ]; then
+       PATH="/usr/lib/ccache:$PATH"
+       # Set the cache directory to local storage, if available
+       [ -w "/usr/local/home/$USER" ] \
+               && export CCACHE_DIR="/usr/local/home/$USER/.ccache"
+fi
+
+# Setup slrn(1) and cleanscore(1), if installed
+type -p cleanscore >/dev/null 2>&1
+[ $? -eq 0 ] && alias slrn="cleanscore -f ~/.slrnscore && slrn"
+
+# Enable color support of ls(1) and also add handy aliases
 if [ "$TERM" != "dumb" ]; then
        type -p dircolors >/dev/null 2>&1 && eval `dircolors -b`
        ls --color / >/dev/null 2>&1

diff --git a/user/bashrc b/user/bashrc
index 18a8ac30c27d9590f1c9e3787b74c796b59dbf4d..d4bfc0b3d6b39da33afb29f2addf624ecb908623 100644 (file)
--- a/user/bashrc
+++ b/user/bashrc
@@ -3,53 +3,9 @@
 # Written 2006-2008 by Alexander Barton (alex@barton.de)
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> ~/.bashrc ..."
+[ -e ~/.ConfigScripts.debug ] && echo " >> ~/.bashrc ..."
 
-[ -z "$BASHRCREAD" -a -r /etc/bash.bashrc ] && source /etc/bash.bashrc
-[ -z "$BASHRCREAD" -a -r /etc/bashrc ] && source /etc/bashrc
-[ -z "$BASHRCREAD" -a -r $HOME/.etc/bashrc ] && source $HOME/.etc/bashrc
-
-# 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 $*
-}
+[ -z "$BASHRCREAD" -a -r ~/.etc/bashrc ] && source ~/.etc/bashrc
+[ -r ~/.bashrc.user ] && source ~/.bashrc.user
 
 # -eof-