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
old mode 100755
(executable)
new mode 100644
(file)
index
1cfca8f
..
67cb90f
--- 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="$(ls -d c:/tools/*jdk*)"
+ JAVA_HOME="$(ls -d c:/tools/*jdk*
2>/dev/null
)"
fi
if [ ! -d "$JAVA_HOME" ]; then
fi
if [ ! -d "$JAVA_HOME" ]; then
- if [ ! -z "$(grep
'd:' /proc/mounts
)" ]; then
+ if [ ! -z "$(grep
-i 'd:' /proc/mounts 2>/dev/null
)" ]; then
# try using a windows version.
# try using a windows version.
- JAVA_HOME="$(ls -d d:/tools/*jdk*)"
+ JAVA_HOME="$(ls -d d:/tools/*jdk*
2>/dev/null
)"
fi
fi
# this should go last, since it changes the bin dir.
fi
fi
# this should go last, since it changes the bin dir.
@@
-65,10
+65,12
@@
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_HOME
unset JAVA_BIN_PIECE
+ if [ -z "$(whichable java 2>/dev/null)" ]; then
+ intuition_failure JAVA_HOME
+ fi
fi
############################
fi
############################
@@
-87,24
+89,27
@@
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR="c:/tools/eclipse"
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR="c:/tools/eclipse"
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
- if [ ! -z "$(grep 'd:' /proc/mounts)" ]; then
+ if [ ! -z "$(grep
-i
'd:' /proc/mounts)" ]; then
ECLIPSE_DIR="d:/tools/eclipse"
fi
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR="d:/tools/eclipse"
fi
fi
if [ ! -d "$ECLIPSE_DIR" ]; then
- if [ ! -z "$(grep 'e:' /proc/mounts)" ]; then
+ if [ ! -z "$(grep
-i
'e:' /proc/mounts)" ]; then
ECLIPSE_DIR="e:/tools/eclipse"
fi
fi
# final option is to whine.
ECLIPSE_DIR="e:/tools/eclipse"
fi
fi
# final option is to whine.
-if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
- intuition_failure ECLIPSE_DIR
+if [ ! -d "$ECLIPSE_DIR" ]; then
unset ECLIPSE_DIR
else
if [ ! -z "$(uname -a | grep -i cygwin)" ]; then
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
ECLIPSE_DIR=$(echo $ECLIPSE_DIR | sed -e 's/^\(.\):/\/cygdrive\/\1/')
fi
fi
+if [ -z "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
+ intuition_failure ECLIPSE_DIR
+fi
############################
############################