Changed the name of the generated package to oracle-java6-jdk

Signed-off-by: Cédric Pineau <cedric.pineau@gmail.com>

diff --git a/lib/j2re.sh b/lib/j2re.sh
index 240a83fed6fa13afc7a772fd79d44ff0a5988ea1..774f2db75fa8e6dcd3d695357450d24c19265162 100644 (file)
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -26,7 +26,7 @@ j2re_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-jre$j2se_release"
+    j2se_package="$j2se_vendor-java$j2se_release-jre"
     j2se_name="jre$j2se_release-$j2se_vendor"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"

diff --git a/lib/j2sdk-doc.sh b/lib/j2sdk-doc.sh
index 4b3075725186256e4e0bd322f560552607f279b5..20aa8d6a94e313a19477e1da06a5803dc3738cfb 100644 (file)
--- a/lib/j2sdk-doc.sh
+++ b/lib/j2sdk-doc.sh
@@ -39,7 +39,7 @@ j2sdk_doc_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-jdk$j2se_release-doc"
+    j2se_package="$j2se_vendor-java$j2se_release-doc"
     j2se_name="jdk$j2se_release-$j2se_vendor-doc"
     local target="$install_dir$javadoc_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"

diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh
index 775ab4216748986305510b232d1d9dadff76bd61..dfb0e04ffdc774a5a01d0b6045e233c0c5216464 100644 (file)
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -28,7 +28,7 @@ j2sdk_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-jdk$j2se_release"
+    j2se_package="$j2se_vendor-java$j2se_release-jdk"
     j2se_name="jdk$j2se_release-$j2se_vendor"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"

diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index 4e5d340c8ece25f572db922cb4ed2ca211f02b73..7ade62954f5a5d031c8d79e873a8bb97e9637037 100644 (file)
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -47,7 +47,7 @@ Detected product:
 EOF
        if read_yn "Is this correct [Y/n]: "; then
            j2se_found=true
-           j2se_release="${j2se_version:0:3}"
+           j2se_release="${j2se_version:2:1}"
            j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
            j2se_vendor="oracle"
            j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)"

diff --git a/lib/oracle-j2sdk-doc.sh b/lib/oracle-j2sdk-doc.sh
index 5b1487f81d4228c38b2c5453f65315928a08aac5..64ccb0f48cdf53c4efcea8ffade549376b9a846e 100644 (file)
--- a/lib/oracle-j2sdk-doc.sh
+++ b/lib/oracle-j2sdk-doc.sh
@@ -23,7 +23,7 @@ Detected product:
 EOF
        if read_yn "Is this correct [Y/n]: "; then
            j2se_found=true
-           j2se_release="${j2se_version:0:3}"
+           j2se_release="${j2se_version:2:1}"
            j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
            j2se_vendor="oracle"
            j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM) Documentation"

diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index c81334d1b33d3e5958a81b425bbdcfc46c37f2b5..34fe38344fb62f7a5220b34fa38c0accbab2dc64 100644 (file)
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -47,7 +47,7 @@ Detected product:
 EOF
        if read_yn "Is this correct [Y/n]: "; then
            j2se_found=true
-           j2se_release="${j2se_version:0:3}"
+           j2se_release="${j2se_version:2:1}"
            j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
            j2se_vendor="oracle"
            j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM)"