chiark / gitweb /
Use OpenJDK if java symlink seems broken
[jarrg-ian.git] / jpctb
diff --git a/jpctb b/jpctb
index 8b61ed8942f655246b9ac7ff42cea09c40f7655a..e04b95682e39124f03c11e7540da67341a9448bc 100755 (executable)
--- a/jpctb
+++ b/jpctb
@@ -24,7 +24,7 @@
 
 
 usage () { cat <<END
-usage: .../jpctb /path/to/dir/with/PCTB*.jar /path/to/yohoho/yohoho [...]
+usage: .../jpctb /path/to/yohoho/yohoho [...]
 END
 }
 
@@ -73,12 +73,17 @@ fi
 
 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"
+elif [ -x $openjdk/bin/java ]; then
+       javadir=$openjdk
 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