Replaced j2re and j2sdk by jre and jdk in the name of the generated packages

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

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

diff --git a/lib/j2sdk-doc.sh b/lib/j2sdk-doc.sh
index 5b1353151c66a9e313d0ed5da8a3def70cd906e6..98bb9cfde5c7269257bafc7eff530e5ecb305a0e 100644 (file)
--- a/lib/j2sdk-doc.sh
+++ b/lib/j2sdk-doc.sh
@@ -39,8 +39,8 @@ j2sdk_doc_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-j2sdk$j2se_release-doc"
-    j2se_name="j2sdk$j2se_release-$j2se_vendor-doc"
+    j2se_package="$j2se_vendor-jdk$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" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"

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