projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated to actually work?
[feisty_meow.git]
/
examples
/
custom_overrides
/
fred
/
java_profile.sh
diff --git
a/examples/custom_overrides/fred/java_profile.sh
b/examples/custom_overrides/fred/java_profile.sh
old mode 100644
(file)
new mode 100755
(executable)
index
2090de2
..
2a9bc6a
--- 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
@@
-79,7
+79,7
@@
if [ ! -d "$ECLIPSE_DIR" ]; then
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
#uhhh, default on winders?
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
#uhhh, default on winders?
- ECLIPSE_DIR="
/c
/Program Files/eclipse"
+ ECLIPSE_DIR="
c:
/Program Files/eclipse"
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR="c:/tools/eclipse"
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR="c:/tools/eclipse"
@@
-93,6
+93,10
@@
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
+else
+ if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+ ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')
+ fi
fi
############################
fi
############################
@@
-101,10
+105,18
@@
fi
# any other paths to different versions.
if [ ! -z "$JAVA_HOME" ]; then
# any other paths to different versions.
if [ ! -z "$JAVA_HOME" ]; then
- export PATH=$JAVA_HOME/$JAVA_BIN_PIECE:$PATH
+ j="$JAVA_HOME"
+ if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+ j=$(echo $j | sed -e 's/^\(.\):/\/cygdrive\/\1/')
+ fi
+ export PATH=$j/$JAVA_BIN_PIECE:$PATH
fi
if [ ! -z "$ECLIPSE_DIR" ]; then
fi
if [ ! -z "$ECLIPSE_DIR" ]; then
- export PATH=$ECLIPSE_DIR:$PATH
+ e="$ECLIPSE_DIR"
+ if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+ e=$(echo $e | sed -e 's/^\(.\):/\/cygdrive\/\1/')
+ fi
+ export PATH=$e:$PATH
fi
############################
fi
############################