[SCM] java-package packaging branch, master, updated. d7060e07977007ffbf5199efaf69e267febc999b

[Cédric Pineau]

The following commit has been merged in the master branch:
commit d7060e07977007ffbf5199efaf69e267febc999b
Author: Cédric Pineau <cedric.pineau at gmail.com>
Date:   Sun Aug 19 14:04:52 2012 +0200

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

diff --git a/lib/j2re.sh b/lib/j2re.sh
index 5e1e496..608d1bd 100644
--- 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 60452b4..e3bb5a2 100644
--- 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"

-- 
java-package packaging