X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=customizing%2Ffred%2Fjava_profile.sh;h=f9268a015adb5b9de99591e41d5501452b784e16;hb=9a3f9b98d7c820bbbfe093c13784694c05f1659d;hp=67cb90fbee2c0f01dd01154683db1fade075d642;hpb=7637cba840b5c3637d33189dc0f9c54234fd0edf;p=feisty_meow.git

diff --git a/customizing/fred/java_profile.sh b/customizing/fred/java_profile.sh
index 67cb90fb..f9268a01 100644
--- a/customizing/fred/java_profile.sh
+++ b/customizing/fred/java_profile.sh
@@ -6,16 +6,18 @@
 
 ############################
 
-function whichable()
-{
-  to_find="$1"; shift
-  which which &>/dev/null
-  if [ $? -ne 0 ]; then
-    # there is no which command here.  we produce nothing due to this.
-    echo
-  fi
-  echo $(which $to_find)
-}
+source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+
+#function whichable()
+#{
+#  to_find="$1"; shift
+#  which which &>/dev/null
+#  if [ $? -ne 0 ]; then
+#    # there is no which command here.  we produce nothing due to this.
+#    echo
+#  fi
+#  echo $(which $to_find)
+#}
 
 # this reports when we have totally failed to figure out where a folder
 # is actually located on the machine.
@@ -43,11 +45,11 @@ export JAVA_BIN_PIECE=bin
 
 if [ ! -d "$JAVA_HOME" ]; then
   # first try a recent linux version.
-  export JAVA_HOME=/usr/lib/jvm/java-6-sun/jre
+  export JAVA_HOME=/usr/lib/jvm/java-6-sun
 fi
 if [ ! -d "$JAVA_HOME" ]; then
   # try an even more recent version.
-  export JAVA_HOME=/usr/lib/jvm/java-7-oracle/jre
+  export JAVA_HOME=/usr/lib/jvm/java-7-oracle
 fi
 if [ ! -d "$JAVA_HOME" ]; then
   JAVA_HOME="$(ls -d c:/tools/*jdk* 2>/dev/null)"
@@ -77,7 +79,7 @@ fi
 
 # intuit where we have our local eclipse.
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  export ECLIPSE_DIR=/usr/local/eclipse_jee
+  export ECLIPSE_DIR=/usr/local/eclipse
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR=$HOME/eclipse