X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=07c0f534ba106b20da02d362d5facd1a8491fa38;hb=7baae411b0b7e504f18e97a27768d0bf378d5027;hp=6226e6d755894b5da832e86aded18a2db1d3d60f;hpb=01e609d08dbd1c3b8fd46bad893bdaa88c499f0f;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index 6226e6d..07c0f53 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,18 +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 mplayer2="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}"
 	;;
@@ -42,3 +42,18 @@ case $- in
 	# non-interactive shell
 	;;
 esac
+
+if [ -f "${JAVA_HOME}" ]; then
+        :
+else
+        export PATH="${PATH}:${JAVA_HOME}/bin"
+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