From 86d41335e1d6010a4b6350c929559b7fe244c5fc Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 6 Mar 2012 16:28:19 -0500 Subject: [PATCH] added some guards for drives on winders that might not be mounted, since we don't want to suffocate trying to look for files on a non-existent drive. --- examples/custom_overrides/fred/java_profile.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh index 2a9bc6a2..24eb0756 100755 --- a/examples/custom_overrides/fred/java_profile.sh +++ b/examples/custom_overrides/fred/java_profile.sh @@ -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 -- 2.34.1