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:
df60551
)
updated for finding jdk on winders too.
author
Chris Koeritz
<fred@gruntose.com>
Fri, 24 Feb 2012 17:13:47 +0000
(09:13 -0800)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 24 Feb 2012 17:13:47 +0000
(09:13 -0800)
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 2090de2d8830c517164019d8502214fc7e965c07..506cc518d047eebc7237f2a5f92590784d549f6b 100644
(file)
--- a/
examples/custom_overrides/fred/java_profile.sh
+++ b/
examples/custom_overrides/fred/java_profile.sh
@@
-67,6
+67,20
@@
fi
############################
############################
+if [ ! -d "$JDK_HOME" ]; then
+ # try using a windows version.
+ JDK_HOME="d:/tools/java6-jdk"
+ if [ -d "$JDK_HOME/jre" ]; then
+ # reset java home.
+ JAVA_HOME="$JDK_HOME/jre"
+ fi
+fi
+if [ ! -d "$JDK_HOME" ]; then
+ intuition_failure JDK_HOME
+fi
+
+############################
+
# intuit where we have our local eclipse.
if [ ! -d "$ECLIPSE_DIR" ]; then
export ECLIPSE_DIR=/usr/local/eclipse_jee
# intuit where we have our local eclipse.
if [ ! -d "$ECLIPSE_DIR" ]; then
export ECLIPSE_DIR=/usr/local/eclipse_jee
@@
-103,6
+117,10
@@
fi
if [ ! -z "$JAVA_HOME" ]; then
export PATH=$JAVA_HOME/$JAVA_BIN_PIECE:$PATH
fi
if [ ! -z "$JAVA_HOME" ]; then
export PATH=$JAVA_HOME/$JAVA_BIN_PIECE:$PATH
fi
+if [ ! -z "$JDK_HOME" ]; then
+#may have to do bin piece if support mac with jdk bit.
+ export PATH=$JDK_HOME/bin:$PATH
+fi
if [ ! -z "$ECLIPSE_DIR" ]; then
export PATH=$ECLIPSE_DIR:$PATH
fi
if [ ! -z "$ECLIPSE_DIR" ]; then
export PATH=$ECLIPSE_DIR:$PATH
fi