X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=examples%2Fcustom_overrides%2Ffred%2Fjava_profile.sh;h=2a9bc6a207583622018bac138930b17a41649167;hb=66e60c3527770ae970ff9f82ad6a48b8be2b251b;hp=72ae763b80f1fa361c666d6f7865b923800eeba1;hpb=82dac81449c7e5fbef9d28dae22bcd8db54440a3;p=feisty_meow.git

diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh
old mode 100644
new mode 100755
index 72ae763b..2a9bc6a2
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -51,7 +51,7 @@ if [ ! -d "$JAVA_HOME" ]; then
 fi
 if [ ! -d "$JAVA_HOME" ]; then
   # try using a windows version.
-  JAVA_HOME=/d/tools/java6-jre
+  JAVA_HOME="d:/tools/java6-jdk"
 fi
 # this should go last, since it changes the bin dir.
 if [ ! -d "$JAVA_HOME" ]; then
@@ -67,20 +67,6 @@ 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
@@ -93,20 +79,24 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
 #uhhh, default on winders?
-  ECLIPSE_DIR="/c/Program Files/eclipse"
+  ECLIPSE_DIR="c:/Program Files/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="/c/tools/eclipse"
+  ECLIPSE_DIR="c:/tools/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="/d/tools/eclipse"
+  ECLIPSE_DIR="d:/tools/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="/e/tools/eclipse"
+  ECLIPSE_DIR="e:/tools/eclipse"
 fi
 # final option is to whine.
 if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
   intuition_failure 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 +105,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=$j/$JAVA_BIN_PIECE:$PATH
 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=$e:$PATH
 fi
 
 ############################