chiark
/
gitweb
/
~yarrgweb
/
jarrg-owen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
615a258
)
Use OpenJDK if java symlink seems broken
author
ceb
<clareb@felix.relativity.greenend.org.uk>
Sat, 19 Jun 2010 15:25:25 +0000
(16:25 +0100)
committer
ceb
<clareb@felix.relativity.greenend.org.uk>
Sat, 19 Jun 2010 15:25:25 +0000
(16:25 +0100)
jpctb
patch
|
blob
|
history
diff --git
a/jpctb
b/jpctb
index 28f71c114110dc25bb4a183b4c0d0c7e1808b9b5..e04b95682e39124f03c11e7540da67341a9448bc 100755
(executable)
--- a/
jpctb
+++ b/
jpctb
@@
-73,12
+73,17
@@
fi
yppdir="${yohoho%/*}"
yppdir="${yohoho%/*}"
+openjdk=/usr/lib/jvm/java-6-openjdk
+
if [ -x "$yppdir/java/bin/java" ]; then
javadir="$yppdir/java"
elif [ x"$JAVA_HOME" != x ] && [ -x "$JAVA_HOME/bin/java" ]; then
javadir="$JAVA_HOME"
if [ -x "$yppdir/java/bin/java" ]; then
javadir="$yppdir/java"
elif [ x"$JAVA_HOME" != x ] && [ -x "$JAVA_HOME/bin/java" ]; then
javadir="$JAVA_HOME"
+elif [ -x $openjdk/bin/java ]; then
+ javadir=$openjdk
else
else
- fail "could not find java runtime system"
+ fail "could not find java runtime system
+ please check that $yppdir/java points to your Java installation"
fi
case "$javadir" in
fi
case "$javadir" in