projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f15edb
)
updated to try to get over ambiguity of which java version etc.
author
Chris Koeritz
<fred@gruntose.com>
Wed, 7 Mar 2012 19:49:50 +0000
(14:49 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Wed, 7 Mar 2012 19:49:50 +0000
(14:49 -0500)
examples/custom_overrides/fred/java_profile.sh
patch
|
blob
|
history
diff --git
a/examples/custom_overrides/fred/java_profile.sh
b/examples/custom_overrides/fred/java_profile.sh
index 7bd29d93a55e0e2d3c02c61aac0c63633706b5b1..1cfca8f01f45dc658267d7b2b8ca6f2f70d36fcc 100755
(executable)
--- a/
examples/custom_overrides/fred/java_profile.sh
+++ b/
examples/custom_overrides/fred/java_profile.sh
@@
-50,12
+50,12
@@
if [ ! -d "$JAVA_HOME" ]; then
export JAVA_HOME=/usr/lib/jvm/java-7-oracle/jre
fi
if [ ! -d "$JAVA_HOME" ]; then
export JAVA_HOME=/usr/lib/jvm/java-7-oracle/jre
fi
if [ ! -d "$JAVA_HOME" ]; then
- JAVA_HOME="
c:/tools/java6-jdk
"
+ JAVA_HOME="
$(ls -d c:/tools/*jdk*)
"
fi
if [ ! -d "$JAVA_HOME" ]; then
if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
# try using a windows version.
fi
if [ ! -d "$JAVA_HOME" ]; then
if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
# try using a windows version.
- JAVA_HOME="
d:/tools/java6-jdk
"
+ JAVA_HOME="
$(ls -d d:/tools/*jdk*)
"
fi
fi
# this should go last, since it changes the bin dir.
fi
fi
# this should go last, since it changes the bin dir.
@@
-67,6
+67,7
@@
fi
# last thing is to tell them we couldn't find it.
if [ ! -d "$JAVA_HOME" -a -z "$(whichable java 2>/dev/null)" ]; then
intuition_failure JAVA_HOME
# last thing is to tell them we couldn't find it.
if [ ! -d "$JAVA_HOME" -a -z "$(whichable java 2>/dev/null)" ]; then
intuition_failure JAVA_HOME
+ unset JAVA_HOME
unset JAVA_BIN_PIECE
fi
unset JAVA_BIN_PIECE
fi
@@
-98,6
+99,7
@@
fi
# final option is to whine.
if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
intuition_failure ECLIPSE_DIR
# final option is to whine.
if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
intuition_failure ECLIPSE_DIR
+ unset ECLIPSE_DIR
else
if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')
else
if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')