From c59d47a263aa58aad65bb27de3d3ab79d8a3cc2e Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 12 Nov 2013 13:36:45 -0500 Subject: [PATCH] updated with progfiles paths. --- customizing/fred/java_profile.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/customizing/fred/java_profile.sh b/customizing/fred/java_profile.sh index 8c731ecc..69de3e2f 100644 --- a/customizing/fred/java_profile.sh +++ b/customizing/fred/java_profile.sh @@ -8,17 +8,6 @@ source $FEISTY_MEOW_SCRIPTS/core/functions.sh -#function whichable() -#{ -# to_find="$1"; shift -# which which &>/dev/null -# if [ $? -ne 0 ]; then -# # there is no which command here. we produce nothing due to this. -# echo -# fi -# echo $(which $to_find) -#} - # this reports when we have totally failed to figure out where a folder # is actually located on the machine. function intuition_failure() @@ -54,6 +43,12 @@ fi if [ ! -d "$JAVA_HOME" ]; then JAVA_HOME="$(ls -d c:/tools/*jdk* 2>/dev/null)" fi +if [ ! -d "$JAVA_HOME" ]; then + JAVA_HOME="$(ls -d "c:/Program Files"/*jdk* 2>/dev/null)" +fi +if [ ! -d "$JAVA_HOME" ]; then + JAVA_HOME="$(ls -d "c:/Program Files (x86)"/*jdk* 2>/dev/null)" +fi if [ ! -d "$JAVA_HOME" ]; then if [ ! -z "$(grep -i 'd:' /proc/mounts 2>/dev/null)" ]; then # try using a windows version. @@ -136,3 +131,5 @@ fi ############################ +echo here at end of script java home is $JAVA_HOME +echo and eclipse is $ECLIPSE_DIR -- 2.34.1