From f684d43bac01b725d2083529c50f91a84bb4124a Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg Date: Wed, 5 Jun 2013 14:48:56 +0200 Subject: [PATCH] Use the upstream versioning scheme (i.e 7u13 instead of 7.13) to match the convention used by the new openjdk packages --- lib/oracle-jdk-doc.sh | 2 +- lib/oracle-jdk.sh | 2 +- lib/oracle-jre.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/oracle-jdk-doc.sh b/lib/oracle-jdk-doc.sh index 1bcf07f..96634de 100644 --- a/lib/oracle-jdk-doc.sh +++ b/lib/oracle-jdk-doc.sh @@ -5,7 +5,7 @@ oracle_j2sdk_doc_detect() { then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[2]} - j2se_version=$j2se_release.$j2se_update + j2se_version=${j2se_release}u${j2se_update} case "$j2se_release" in 6) # JDK 6 diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh index 090c2cf..fecb296 100644 --- a/lib/oracle-jdk.sh +++ b/lib/oracle-jdk.sh @@ -7,7 +7,7 @@ oracle_j2sdk_detect() { j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[2]} j2se_arch=${BASH_REMATCH[3]} - j2se_version=$j2se_release.$j2se_update + j2se_version=${j2se_release}u${j2se_update} j2se_priority=$((310 + $j2se_release)) j2se_expected_min_size=130 #Mb diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh index db287cd..04c47e6 100644 --- a/lib/oracle-jre.sh +++ b/lib/oracle-jre.sh @@ -7,7 +7,7 @@ oracle_j2re_detect() { j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[2]} j2se_arch=${BASH_REMATCH[3]} - j2se_version=$j2se_release.$j2se_update + j2se_version=${j2se_release}u${j2se_update} j2se_priority=$((310 + $j2se_release - 1)) j2se_expected_min_size=85 #Mb -- 2.39.5