nice changes to enable an shunit test to be called without requiring an

[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 100755 (executable)
new mode 100644 (file)
index 4d55c6d..67cb90f
--- 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="$(ls -d c:/tools/*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="$(ls -d d:/tools/*jdk*)"
+    JAVA_HOME="$(ls -d d:/tools/*jdk* 2>/dev/null)"
   fi
 fi
 # this should go last, since it changes the bin dir.
@@ -89,12 +89,12 @@ 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
@@ -121,14 +121,14 @@ if [ ! -z "$JAVA_HOME" ]; then
   if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
     j=$(echo $j | sed -e 's/^\(.\):/\/cygdrive\/\1/')
   fi
-  export PATH=$PATH:$j/$JAVA_BIN_PIECE
+  export PATH=$j/$JAVA_BIN_PIECE:$PATH
 fi
 if [ ! -z "$ECLIPSE_DIR" ]; then
   e="$ECLIPSE_DIR"
   if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
     e=$(echo $e | sed -e 's/^\(.\):/\/cygdrive\/\1/')
   fi
-  export PATH=$PATH:$e
+  export PATH=$e:$PATH
 fi
 
 ############################