X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=b424553e2007894bd808fd8eca8955d0434773d9;hb=0a97cf990f7f3ad45495df8f00d40e1bd5a722fd;hp=b477840ce9a51a65e29fc87dff1188068ca38bf5;hpb=13cbe300354de36fe9721e4171d294b346887209;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index b477840..b424553 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,17 +5,46 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
+if [ -f ~/.bashrc-local ]; then
+	. ~/.bashrc-local
+fi
+
+xlock2() {
+        ps aux | grep -v grep | grep xscreensaver > /dev/null
+        if [ $? -ne 0 ]; then
+                echo "starting xscreensaver..."
+                xscreensaver &
+        fi
+        until xscreensaver-command -lock; do
+                sleep 1
+        done
+}
+
 case $- in
 *i*)
 	# interactive shell
-	alias ls='ls --color=auto'
+        ls --color /tmp &>/dev/null && alias ls='ls --color=auto'
 	alias mv='mv -i'
 	alias vi='vim'
 	alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
-	alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
+	alias grep='grep --color=tty -d skip'
+        alias bterm='xterm -fn "-adobe-courier-bold-r-normal--34-240-100-100-m-200-iso8859-1" -geometry 60x30-50-50'
+        alias mplayer="mplayer -fs -ac a52,"
 	export PATH="${PATH}:${HOME}/cmccabe-bin"
+    [ -d "${HOME}/cmccabe-hbin" ] && export PATH="${PATH}:${HOME}/cmccabe-hbin"
+	export EDITOR="/usr/bin/vim"
+	export CSCOPE_EDITOR="${EDITOR}"
 	;;
 *)
 	# non-interactive shell
 	;;
 esac
+
+# Perturb malloc so that we spot bugs quicker!
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+
+# Do not add lines that begin with a space to the history
+export HISTIGNORE="[ ]*"
+
+# Append history list of current session to HISTFILE
+shopt -s histappend