From: Benjamin Drung <benjamin.drung@profitbricks.com>
Date: Tue, 17 Jun 2014 17:43:46 +0000 (+0200)
Subject: Group commands to create debian/install.
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=8554bdeb96e4dae5b9cd2b9552ded43db62c7d80;p=sven%2Fjava-package.git

Group commands to create debian/install.
---

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 220f213..25d7d9c 100644
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -49,13 +49,13 @@ j2sdk_run() {
     j2se_changelog > "$debian_dir/changelog"
     j2sdk_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"
-    echo "$j2se_name $jvm_base" > "$debian_dir/install"
     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"
-    echo ".$j2se_name.jinfo $jvm_base" >> "$debian_dir/install"
+    echo ".$j2se_name.jinfo $jvm_base" > "$debian_dir/install"
+    echo "$j2se_name $jvm_base" >> "$debian_dir/install"
     j2se_build
 }
diff --git a/lib/jre.sh b/lib/jre.sh
index 9154993..b19e6ce 100644
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -35,13 +35,13 @@ j2re_run() {
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"
-    echo "$j2se_name $jvm_base" > "$debian_dir/install"
     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"
-    echo ".$j2se_name.jinfo $jvm_base" >> "$debian_dir/install"
+    echo ".$j2se_name.jinfo $jvm_base" > "$debian_dir/install"
+    echo "$j2se_name $jvm_base" >> "$debian_dir/install"
     j2se_build
 }