Use package name as directory in /usr/lib/jvm

diff --git a/lib/javase.sh b/lib/javase.sh
index 37a9254f1776ba2b6748e91aefa123f25c63e3b6..6309e9f29d22480071a5f79404d46153326b36bc 100644 (file)
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -269,7 +269,15 @@ j2se_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_name="jre-$j2se_release-$j2se_vendor-$j2se_arch"
+    case "${j2se_arch}" in
+      i586)
+        j2se_debian_arch=i386
+        ;;
+      amd64|x64)
+        j2se_debian_arch=amd64
+        ;;
+    esac
+    j2se_name="$j2se_package-$j2se_debian_arch"
     local target="$package_dir/$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"

diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh
index c49ecd32f31f725dcef6716243e21398864f039e..9d27ae4251963544f31382d91a24e80403485382 100644 (file)
--- a/lib/jdk-doc.sh
+++ b/lib/jdk-doc.sh
@@ -38,7 +38,7 @@ j2sdk_doc_run() {
     diskfree "$j2se_required_space"
     read_maintainer_info
     j2se_package="$j2se_vendor-java$j2se_release-doc"
-    j2se_name="jdk$j2se_release-$j2se_vendor-doc"
+    j2se_name="$j2se_package"
     local target="$package_dir/$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"