X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=915664e04ab69a6af309dc14ef46cc6c5fcedc42;hb=efca92311f2d86a33b502c24c9c8aa0c80109064;hp=0f1c4e7909faedcebeb8207110d206b66de5b64d;hpb=798aff79d41ca995ea455a6102037340384ef0d2;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index 0f1c4e7..915664e 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
@@ -15,22 +18,46 @@ xlock2() {
                 echo "starting xscreensaver..."
                 xscreensaver &
         fi
-        xscreensaver-command -lock
+        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 vim='vim -X'
+	alias vi='vim -X'
 	alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
 	alias grep='grep --color=tty -d skip'
-	export PATH="${PATH}:${HOME}/cmccabe-bin"
-	export EDITOR="/usr/bin/vim"
+        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="${HOME}/cmccabe-bin:${PATH}"
+    [ -d "${HOME}/cmccabe-hbin" ] && export PATH="${PATH}:${HOME}/cmccabe-hbin"
+	export EDITOR="/usr/bin/vim -X"
 	export CSCOPE_EDITOR="${EDITOR}"
 	;;
 *)
 	# 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