X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcustomize%2Ffred%2Fjava_profile.sh;h=b8e71a33b4827f2d67127d93a6c14e691a938703;hb=78260fb9e066ca6e391494b567b2758073491edc;hp=672df77d9ec5f5e2705b60bfec01b15cf170edbc;hpb=c5d44af5a928ffcfe0dc059e0858f57e4b7dd13c;p=feisty_meow.git diff --git a/scripts/customize/fred/java_profile.sh b/scripts/customize/fred/java_profile.sh index 672df77d..b8e71a33 100644 --- a/scripts/customize/fred/java_profile.sh +++ b/scripts/customize/fred/java_profile.sh @@ -13,7 +13,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" 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