X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-jdk.sh;h=1fa6657291016b37d0cd28a5079c60688fd376f3;hp=ee635d07fc4d691b1595a080f550f436d4c3e1f4;hb=b6837e16b8bce79617d70f34f8b6772b6ec4666f;hpb=180e0729ecd87f3e76c66ce3a7bae594ee19729d diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh index ee635d0..1fa6657 100644 --- a/lib/oracle-jdk.sh +++ b/lib/oracle-jdk.sh @@ -12,10 +12,10 @@ oracle_j2sdk_detect() { if [[ $j2se_update != "" ]] then j2se_version_name="$j2se_release Update $j2se_update" - j2se_version=${j2se_release}u${j2se_update} + j2se_version=${j2se_release}u${j2se_update}${revision} else j2se_version_name="$j2se_release GA" - j2se_version=${j2se_release} + j2se_version=${j2se_release}${revision} fi fi @@ -29,10 +29,10 @@ oracle_j2sdk_detect() { if [[ $j2se_update != "" ]] then j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build" - j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build} + j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}${revision} else j2se_version_name="$j2se_release Early Access Release Build $j2se_build" - j2se_version=${j2se_release}~ea-build-${j2se_build} + j2se_version=${j2se_release}~ea-build-${j2se_build}${revision} fi fi @@ -74,8 +74,8 @@ oracle_j2sdk_detect() { echo "The archive $archive_name is not supported on the ${DEB_BUILD_ARCH} architecture" return fi - - + + cat << EOF Detected product: @@ -104,7 +104,7 @@ EOF oracle_no_man_jre_bin_jre="ControlPanel" fi oracle_jre_lib_hl="jexec" - oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jps jrunscript jsadebugd jstack jstat jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc" + oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jmc jps jrunscript jsadebugd jstack jstat jstatd jvisualvm native2ascii rmic schemagen serialver wsgen wsimport xjc" j2sdk_run fi fi