From e25d4d4e91a51565d5d655ba173fa891b2745b31 Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg Date: Mon, 6 Feb 2012 12:16:58 +0100 Subject: [PATCH] Changed the name of the generated package to oracle-java6-jdk MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric Pineau --- lib/j2re.sh | 2 +- lib/j2sdk-doc.sh | 2 +- lib/j2sdk.sh | 2 +- lib/oracle-j2re.sh | 2 +- lib/oracle-j2sdk-doc.sh | 2 +- lib/oracle-j2sdk.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/j2re.sh b/lib/j2re.sh index 240a83f..774f2db 100644 --- 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 4b30757..20aa8d6 100644 --- 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 775ab42..dfb0e04 100644 --- 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 4e5d340..7ade629 100644 --- 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 5b1487f..64ccb0f 100644 --- 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 c81334d..34fe383 100644 --- 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)" -- 2.39.5