added some guards for drives on winders that might not be mounted, since we don't...
authorChris Koeritz <fred@gruntose.com>
Tue, 6 Mar 2012 21:28:19 +0000 (16:28 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 6 Mar 2012 21:28:19 +0000 (16:28 -0500)
suffocate trying to look for files on a non-existent drive.

examples/custom_overrides/fred/java_profile.sh

index 2a9bc6a207583622018bac138930b17a41649167..24eb0756e12cd5513ff54a755c108b6b386b5ea3 100755 (executable)
@@ -50,8 +50,10 @@ 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-jdk"
+  if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
+    # try using a windows version.
+    JAVA_HOME="d:/tools/java6-jdk"
+  fi
 fi
 # this should go last, since it changes the bin dir.
 if [ ! -d "$JAVA_HOME" ]; then
@@ -77,18 +79,18 @@ 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