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:
82dac81
)
still trying to find sweet spot for windows java.
author
Chris Koeritz
<fred@gruntose.com>
Fri, 24 Feb 2012 17:53:39 +0000
(12:53 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 24 Feb 2012 17:53:39 +0000
(12:53 -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 72ae763b80f1fa361c666d6f7865b923800eeba1..2df35a483d88c680ecb716e28aa47398181f08b4 100644
(file)
--- a/
examples/custom_overrides/fred/java_profile.sh
+++ b/
examples/custom_overrides/fred/java_profile.sh
@@
-51,7
+51,7
@@
if [ ! -d "$JAVA_HOME" ]; then
fi
if [ ! -d "$JAVA_HOME" ]; then
# try using a windows version.
fi
if [ ! -d "$JAVA_HOME" ]; then
# try using a windows version.
- JAVA_HOME=
/d/tools/java6-jre
+ JAVA_HOME=
"/d/tools/java6-jdk"
fi
# this should go last, since it changes the bin dir.
if [ ! -d "$JAVA_HOME" ]; then
fi
# this should go last, since it changes the bin dir.
if [ ! -d "$JAVA_HOME" ]; then
@@
-67,20
+67,6
@@
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
@@
-117,10
+103,6
@@
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