cleaned up some logging.

[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
index 82bf336e5c39adb81c80fc74275a44a783eb9048..0f25a7ac3988bba13333c14bcd1e47d8974f4d09 100644 (file)
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -6,10 +6,14 @@
 
 ############################
 
+# this reports when we have totally failed to figure out where a folder
+# is actually located on the machine.
 function intuition_failure()
 {
   missing="$1"; shift
-  echo "We cannot intuit your $missing variable for this host."
+  if [ ! -z "$SHELL_DEBUG" ]; then
+    echo "Could not intuit '$missing' variable."
+  fi
   # remove the variable because its value is busted.
   unset $missing
 }
@@ -31,6 +35,7 @@ if [ ! -d "$JAVA_HOME" ]; then
   export JAVA_HOME=/usr/lib/jvm/java-6-sun/jre
 fi
 if [ ! -d "$JAVA_HOME" ]; then
+  # try an even more recent version.
   export JAVA_HOME=/usr/lib/jvm/java-7-oracle/jre
 fi
 if [ ! -d "$JAVA_HOME" ]; then
@@ -58,7 +63,7 @@ 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" ]; then
+if [ ! -d "$JAVA_HOME" -a -z "$(which java)" ]; then
   intuition_failure JAVA_HOME
   unset JAVA_BIN_PIECE
 fi
@@ -89,7 +94,9 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="/e/tools/eclipse"
 fi
 # final option is to whine.
-if [ ! -d "$ECLIPSE_DIR" ]; then intuition_failure ECLIPSE_DIR; fi
+if [ ! -d "$ECLIPSE_DIR" -a -z "$(which eclipse)" ]; then
+  intuition_failure ECLIPSE_DIR
+fi
 
 ############################