X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=examples%2Fcustom_overrides%2Ffred%2Fjava_profile.sh;h=67cb90fbee2c0f01dd01154683db1fade075d642;hb=e3d3afd48f7f94e751677042e8b8b37a9ab09a35;hp=7bd29d93a55e0e2d3c02c61aac0c63633706b5b1;hpb=3f15edb47241a3945f22f999209b733dc9f77d21;p=feisty_meow.git

diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh
old mode 100755
new mode 100644
index 7bd29d93..67cb90fb
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -50,12 +50,12 @@ if [ ! -d "$JAVA_HOME" ]; then
   export JAVA_HOME=/usr/lib/jvm/java-7-oracle/jre
 fi
 if [ ! -d "$JAVA_HOME" ]; then
-  JAVA_HOME="c:/tools/java6-jdk"
+  JAVA_HOME="$(ls -d c:/tools/*jdk* 2>/dev/null)"
 fi
 if [ ! -d "$JAVA_HOME" ]; then
-  if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
+  if [ ! -z "$(grep -i 'd:' /proc/mounts 2>/dev/null)" ]; then
     # try using a windows version.
-    JAVA_HOME="d:/tools/java6-jdk"
+    JAVA_HOME="$(ls -d d:/tools/*jdk* 2>/dev/null)"
   fi
 fi
 # this should go last, since it changes the bin dir.
@@ -65,9 +65,12 @@ if [ ! -d "$JAVA_HOME" ]; then
   JAVA_BIN_PIECE=Commands
 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
+if [ ! -d "$JAVA_HOME" ]; then
+  unset JAVA_HOME
   unset JAVA_BIN_PIECE
+  if [ -z "$(whichable java 2>/dev/null)" ]; then
+    intuition_failure JAVA_HOME
+  fi
 fi
 
 ############################
@@ -86,23 +89,27 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="c:/tools/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
+  if [ ! -z "$(grep -i 'd:' /proc/mounts)" ]; then
     ECLIPSE_DIR="d:/tools/eclipse"
   fi
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  if [ ! -z "$(grep 'e:' /proc/mounts)" ]; then
+  if [ ! -z "$(grep -i '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
+if [ ! -d "$ECLIPSE_DIR" ]; then
+  unset ECLIPSE_DIR
 else
   if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+    # fix the path for cygwin's bizarre requirement of /cygdrive/X.
     ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')
   fi
 fi
+if [ -z "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
+  intuition_failure ECLIPSE_DIR
+fi
 
 ############################