From b9bdcb104057850c2bdb345b19c8e5e5f58dbf2b Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Thu, 17 Mar 2016 14:56:13 +0100 Subject: [PATCH] Use package name as directory in /usr/lib/jvm --- lib/javase.sh | 10 +++++++++- lib/jdk-doc.sh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/javase.sh b/lib/javase.sh index 37a9254..6309e9f 100644 --- 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 c49ecd3..9d27ae4 100644 --- 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" -- 2.39.5