projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new fortunes
[feisty_meow.git]
/
customizing
/
fred
/
java_profile.sh
diff --git
a/customizing/fred/java_profile.sh
b/customizing/fred/java_profile.sh
index 8c731ecc8b52ac403fabcb603968bf09dd5c5a55..dad2ae9b9d8a561ae20b9540e7edfe9166260e33 100644
(file)
--- a/
customizing/fred/java_profile.sh
+++ b/
customizing/fred/java_profile.sh
@@
-8,17
+8,6
@@
source $FEISTY_MEOW_SCRIPTS/core/functions.sh
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()
# 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:/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.
if [ ! -d "$JAVA_HOME" ]; then
if [ ! -z "$(grep -i 'd:' /proc/mounts 2>/dev/null)" ]; then
# try using a windows version.
@@
-135,4
+130,5
@@
fi
############################
############################
+#echo "java_profile: JAVA_HOME='$JAVA_HOME' ECLIPSE_DIR='$ECLIPSE_DIR'"