X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=cdfad1346ab8db4b5c62e319b37b0706b72ebd66;hb=2ca5a6929c8632601a9dda26b0defec6d315cf93;hp=6e3606e5f1730ec3190f80192e47e4b96d07d8b0;hpb=d760fcfb6375a0b42337f8f7586bf4bedb4e1214;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index 6e3606e..cdfad13 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,8 @@
 # .bashrc
 
+if [ "x$BASH_VERSION" = "x" ]; then
+        :
+else
 # Source global definitions
 if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
@@ -23,23 +26,15 @@ xlock2() {
 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 grep='grep --color=tty -d skip'
-        alias bterm='xterm -fn "-adobe-courier-bold-r-normal--34-240-100-100-m-200-iso8859-1"'
-	#alias mplayer3="mplayer -fs \
-#-vo gl2 \
-#-dr -noslices -xineramascreen 1 \
-#-ao jack,port=4444,estimate,noautostart"
-	alias mplayer="mplayer -fs \
--vo gl2 \
--dr -noslices -xineramascreen 1"
-	#alias mplayer="mplayer -fs \
-#-vo gl:yuv=2:noati-hack:rectangle=0:noaspect \
-#-dr -noslices -xineramascreen 1"
+        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}"
 	;;
@@ -47,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