absjava=`readlink -f "$yppjava"`
echo " abs. java: \"$absjava\""
case "$absjava" in
- */jre/bin/java)
- echo " found jre directory, good"
- javadir="${absjava%/jre/bin/java}"
+ */*/bin/java)
+ javadir="${absjava%/bin/java}"
+ jreleaf="${javadir##*/}"
+ javadir="${javadir%/*}"
+ echo " jre leaf dir: \"$jreleaf\""
+ case "$jreleaf" in
+ jre) echo " found jre directory, good";;
+ jre1.*) echo " found versioned jre directory $jreleaf, ok";;
+ *) nojre "java binary not in jre dir ($jreleaf)";;
+ esac
;;
*)
- nojre "java binary not in jre dir"
- ;;
+ nojre "real java binary not in ../bin/java dir";;
esac
fi
linkfarm="$jtmp/linkfarm"
extdir="$jtmp/ext"
-export JPCTB_JRE="$javadir/jre"
+export JPCTB_JRE="$javadir/$jreleaf"
#---------- confirm for the user which paths we're using ----------
#---------- edit the linkfarm to have our jvm wrapper ----------
-wrapper="$linkfarm"/jre/bin/java
+wrapper="$linkfarm"/$jreleaf/bin/java
rm -- "$wrapper"
export JPCTB_EXTDIR="$extdir"
#---------- now run it ----------
-exec $setup_only_simulate "$yohoho" -Djava.home="$linkfarm/jre"
+exec $setup_only_simulate "$yohoho" -Djava.home="$linkfarm/$jreleaf"