not adding eclipse and java at front of path, since they don't need to be there.

[feisty_meow.git] / examples / custom_overrides / fred / java_profile.sh

diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh
old mode 100644 (file)
new mode 100755 (executable)
index 506cc51..72709c6
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -50,8 +50,13 @@ if [ ! -d "$JAVA_HOME" ]; then
   export JAVA_HOME=/usr/lib/jvm/java-7-oracle/jre
 fi
 if [ ! -d "$JAVA_HOME" ]; then
-  # try using a windows version.
-  JAVA_HOME=d:/tools/java6-jre
+  JAVA_HOME="$(ls -d c:/tools/*jdk*)"
+fi
+if [ ! -d "$JAVA_HOME" ]; then
+  if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
+    # try using a windows version.
+    JAVA_HOME="$(ls -d d:/tools/*jdk*)"
+  fi
 fi
 # this should go last, since it changes the bin dir.
 if [ ! -d "$JAVA_HOME" ]; then
@@ -62,25 +67,12 @@ fi
 # last thing is to tell them we couldn't find it.
 if [ ! -d "$JAVA_HOME" -a -z "$(whichable java 2>/dev/null)" ]; then
   intuition_failure JAVA_HOME
+  unset JAVA_HOME
   unset JAVA_BIN_PIECE
 fi
 
 ############################
 
-if [ ! -d "$JDK_HOME" ]; then
-  # try using a windows version.
-  JDK_HOME="d:/tools/java6-jdk"
-  if [ -d "$JDK_HOME/jre" ]; then
-    # reset java home.
-    JAVA_HOME="$JDK_HOME/jre"
-  fi
-fi
-if [ ! -d "$JDK_HOME" ]; then
-  intuition_failure JDK_HOME
-fi
-
-############################
-
 # intuit where we have our local eclipse.
 if [ ! -d "$ECLIPSE_DIR" ]; then
   export ECLIPSE_DIR=/usr/local/eclipse_jee
@@ -91,22 +83,27 @@ fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR=$HOME/apps/eclipse
 fi
-if [ ! -d "$ECLIPSE_DIR" ]; then
-#uhhh, default on winders?
-  ECLIPSE_DIR="/c/Program Files/eclipse"
-fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="c:/tools/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="d:/tools/eclipse"
+  if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
+    ECLIPSE_DIR="d:/tools/eclipse"
+  fi
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="e:/tools/eclipse"
+  if [ ! -z "$(grep 'e:' /proc/mounts)" ]; then
+    ECLIPSE_DIR="e:/tools/eclipse"
+  fi
 fi
 # final option is to whine.
 if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
   intuition_failure ECLIPSE_DIR
+  unset ECLIPSE_DIR
+else
+  if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+    ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')
+  fi
 fi
 
 ############################
@@ -115,14 +112,18 @@ fi
 # any other paths to different versions.
 
 if [ ! -z "$JAVA_HOME" ]; then
-  export PATH=$JAVA_HOME/$JAVA_BIN_PIECE:$PATH
-fi
-if [ ! -z "$JDK_HOME" ]; then
-#may have to do bin piece if support mac with jdk bit.
-  export PATH=$JDK_HOME/bin:$PATH
+  j="$JAVA_HOME"
+  if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+    j=$(echo $j | sed -e 's/^\(.\):/\/cygdrive\/\1/')
+  fi
+  export PATH=$PATH:$j/$JAVA_BIN_PIECE
 fi
 if [ ! -z "$ECLIPSE_DIR" ]; then
-  export PATH=$ECLIPSE_DIR:$PATH
+  e="$ECLIPSE_DIR"
+  if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+    e=$(echo $e | sed -e 's/^\(.\):/\/cygdrive\/\1/')
+  fi
+  export PATH=$PATH:$e
 fi
 
 ############################