-if [ "x$javadir" = x ] && [ x"$JAVA_HOME" != x ] && \
- [ -x "$JAVA_HOME/bin/java" ]; then
-cat <<END
- yohoho/java/bin/java nonexistent or unsuitable, trying JAVA_HOME"
- JAVA_HOME: "$JAVA_HOME"
-END
- if [ -d "$JAVA_HOME/jre" ]; then
- javadir="$JAVA_HOME"
- else
- echo " JAVA_HOME has no jre subdirectory, hmm."
- fi
-fi
-
-if [ "x$javadir" = x ]; then
- fail "could not find java runtime system
- please check that $yppdir/java points to your Java installation"
+javadir="${yppjava%/bin/java}"
+if [ -x "$javadir/jre/bin/java" ]; then
+ echo " java/ points to the jre, good"
+else
+ echo " java/ has just the executable bin/java, trying readlink"
+ absjava=`readlink -f "$yppjava"`
+ echo " abs. java: \"$absjava\""
+ case "$absjava" in
+ */jre/bin/java)
+ echo " found jre directory, good"
+ javadir="${absjava%/jre/bin/java}"
+ ;;
+ *)
+ nojre "java binary not in jre dir"
+ ;;
+ esac