new git_info script reports on repository, added cygwindrive mounter function for...

[feisty_meow.git] / customizing / fred / java_profile.sh

diff --git a/customizing/fred/java_profile.sh b/customizing/fred/java_profile.sh
index b78309e0aedd80738133473f8ddb9c079403c87a..f9268a015adb5b9de99591e41d5501452b784e16 100644 (file)
--- 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)"