Merge branch 'release-2.140.122'

[feisty_meow.git] / scripts / customize / fred / java_profile.sh

diff --git a/scripts/customize/fred/java_profile.sh b/scripts/customize/fred/java_profile.sh
index 30128a22c96e3b6958d995611914e369df750237..b8e71a33b4827f2d67127d93a6c14e691a938703 100644 (file)
--- a/scripts/customize/fred/java_profile.sh
+++ b/scripts/customize/fred/java_profile.sh
@@ -6,14 +6,14 @@
 
 ############################
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
 # 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
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo "Could not intuit '$missing' variable."
   fi
   # remove the variable because its value is busted.
@@ -65,7 +65,7 @@ fi
 if [ ! -d "$JAVA_HOME" ]; then
   unset JAVA_HOME
   unset JAVA_BIN_PIECE
-  if [ -z "$(whichable java 2>/dev/null)" ]; then
+  if [ -z "$(whichable java)" ]; then
     intuition_failure JAVA_HOME
   fi
 fi
@@ -80,7 +80,7 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR=$HOME/eclipse
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR=$HOME/apps/eclipse
+  ECLIPSE_DIR=/usr/local/fred/eclipse
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="c:/tools/eclipse"
@@ -104,7 +104,7 @@ else
     ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')
   fi
 fi
-if [ -z "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
+if [ -z "$ECLIPSE_DIR" -a -z "$(whichable eclipse)" ]; then
   intuition_failure ECLIPSE_DIR
 fi