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 include all of cak0l branch.
[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
index 72ae763b80f1fa361c666d6f7865b923800eeba1..67cb90fbee2c0f01dd01154683db1fade075d642 100644
(file)
--- a/
examples/custom_overrides/fred/java_profile.sh
+++ b/
examples/custom_overrides/fred/java_profile.sh
@@
-50,8
+50,13
@@
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
- # try using a windows version.
- JAVA_HOME=/d/tools/java6-jre
+ JAVA_HOME="$(ls -d c:/tools/*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.
+ JAVA_HOME="$(ls -d d:/tools/*jdk* 2>/dev/null)"
+ fi
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
@@
-60,24
+65,13
@@
if [ ! -d "$JAVA_HOME" ]; then
JAVA_BIN_PIECE=Commands
fi
# last thing is to tell them we couldn't find it.
JAVA_BIN_PIECE=Commands
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
+if [ ! -d "$JAVA_HOME" ]; then
+
unset
JAVA_HOME
unset JAVA_BIN_PIECE
unset JAVA_BIN_PIECE
-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"
+ if [ -z "$(whichable java 2>/dev/null)" ]; then
+ intuition_failure JAVA_HOME
fi
fi
fi
fi
-if [ ! -d "$JDK_HOME" ]; then
- intuition_failure JDK_HOME
-fi
############################
############################
@@
-92,20
+86,28
@@
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR=$HOME/apps/eclipse
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR=$HOME/apps/eclipse
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
-#uhhh, default on winders?
- ECLIPSE_DIR="/c/Program Files/eclipse"
+ ECLIPSE_DIR="c:/tools/eclipse"
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
- ECLIPSE_DIR="/c/tools/eclipse"
+ if [ ! -z "$(grep -i 'd:' /proc/mounts)" ]; then
+ ECLIPSE_DIR="d:/tools/eclipse"
+ fi
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
- ECLIPSE_DIR="/d/tools/eclipse"
+ if [ ! -z "$(grep -i 'e:' /proc/mounts)" ]; then
+ ECLIPSE_DIR="e:/tools/eclipse"
+ fi
fi
fi
+# final option is to whine.
if [ ! -d "$ECLIPSE_DIR" ]; then
if [ ! -d "$ECLIPSE_DIR" ]; then
- ECLIPSE_DIR="/e/tools/eclipse"
+ unset ECLIPSE_DIR
+else
+ if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
+ # fix the path for cygwin's bizarre requirement of /cygdrive/X.
+ ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')
+ fi
fi
fi
-# final option is to whine.
-if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
+if [ -z "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
intuition_failure ECLIPSE_DIR
fi
intuition_failure ECLIPSE_DIR
fi
@@
-115,14
+117,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
-fi
-if [ ! -z "$JDK_HOME" ]; then
-#may have to do bin piece if support mac with jdk bit.
- export PATH=$
JDK_HOME/bin
:$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
############################