X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=cdfad1346ab8db4b5c62e319b37b0706b72ebd66;hb=f5cfb039702c5a0f5b65066ce8c651844c11ebcc;hp=c71388cdb9937c87c38c367546a19ee8e2d5afe0;hpb=7d7310f4157dd6768ad3120dee41b52f9b03ed3c;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index c71388c..cdfad13 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,19 +1,40 @@
 # .bashrc
 
+if [ "x$BASH_VERSION" = "x" ]; then
+        :
+else
 # Source global definitions
 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}"
 	;;
@@ -21,3 +42,21 @@ case $- in
 	# non-interactive shell
 	;;
 esac
+
+if [ -f "${JAVA_HOME}" ]; then
+        :
+else
+        export PATH="${PATH}:${JAVA_HOME}/bin"
+
+        # Maven always needs more memory than the default.
+        export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
+fi
+# 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
+fi