install-symlinks.sh: handle pre-existing stuff better

[cmccabe-etc] / .bashrc

diff --git a/.bashrc b/.bashrc
index b424553..07c0f53 100644 (file)
--- 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
@@ -40,6 +43,11 @@ case $- in
        ;;
 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))
 
@@ -48,3 +56,4 @@ export HISTIGNORE="[ ]*"
 
 # Append history list of current session to HISTFILE
 shopt -s histappend
+fi