Change installation directory to be jdk|jre-relase.update-vendor-arch

diff --git a/lib/j2re.sh b/lib/j2re.sh
index 5e1e496718dd1b3b76e61922bbe65dd3a8a1416d..608d1bdabd97828d802c4bc321369bcf0fdd13ec 100644 (file)
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -27,7 +27,7 @@ j2re_run() {
     diskfree "$j2se_required_space"
     read_maintainer_info
     j2se_package="$j2se_vendor-java$j2se_release-jre"
-    j2se_name="jre$j2se_release-$j2se_vendor"
+    j2se_name="jre-$j2se_version-$j2se_vendor-$j2se_arch"
     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.sh b/lib/j2sdk.sh
index 60452b498bf75fde511f7e89f2083613750a81d5..e3bb5a2309c4fa194a3216a2145616b4ee7a7887 100644 (file)
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -29,7 +29,7 @@ j2sdk_run() {
     diskfree "$j2se_required_space"
     read_maintainer_info
     j2se_package="$j2se_vendor-java$j2se_release-jdk"
-    j2se_name="jdk$j2se_release-$j2se_vendor"
+    j2se_name="jdk-$j2se_version-$j2se_vendor-$j2se_arch"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"