X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fj2re.sh;fp=lib%2Fj2re.sh;h=94ce4a73977c5aea2d790e79c87bfb26587a74e5;hp=bbeb10d601a14fd0dd22c631860a15fbd0ea313b;hb=adec26aa8261b379a1db4ca72142b7ddc51f4e75;hpb=9e241f83087a526985b6edbc7070d5dc36a1ac33

diff --git a/lib/j2re.sh b/lib/j2re.sh
index bbeb10d..94ce4a7 100644
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -1,12 +1,5 @@
-function j2re_readme() {
-    j2se_readme
-}
-
-function j2re_changelog() {
-    j2se_changelog
-}
 
-function j2re_control() {
+j2re_control() {
     j2se_control
     cat << EOF
 Package: $j2se_package
@@ -28,39 +21,24 @@ Description: $j2se_title
 EOF
 }
 
-function j2re_copyright() {
-    j2se_copyright
-}
-
-function j2re_install_scripts() {
-    j2se_install_scripts
-}
-
-function j2re_info() {
-    j2se_info
-}
-
-function j2re_build() {
-    j2se_build
-}
-
 # build debian package
-function j2re_run() {
+j2re_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
     j2se_package="$j2se_vendor-j2re$j2se_release"
-    j2se_base="/usr/lib/jvm/j2re$j2se_release-$j2se_vendor"
-    local target="$install_dir$j2se_base"
+    j2se_name="j2re$j2se_release-$j2se_vendor"
+    local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
     rm -rf "$target/.systemPrefs"
-    j2re_readme > "$debian_dir/README.Debian"
-    j2re_changelog > "$debian_dir/changelog"
+    j2se_readme > "$debian_dir/README.Debian"
+    j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"
-    j2re_copyright > "$debian_dir/copyright"
-    j2re_install_scripts
+    j2se_copyright > "$debian_dir/copyright"
+    j2se_install_scripts
     install -d "$target/debian"
-    j2re_info > "$target/debian/info"
-    j2re_build
+    j2se_info > "$target/debian/info"
+    eval "$j2se_jinfo" > "$install_dir$jvm_base.$j2se_name.jinfo"
+    j2se_build
 }