X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=make-jpkg;h=5a788db11f5795e0300956ddd6d62b6c6d64032b;hp=2c829629e8e8494be6a8a153bf3a10a791404010;hb=3b02a020be93b645a2957b34e5114e8e4c67c322;hpb=ca8b5d176518ea838461b92229d2fbebb3731de8

diff --git a/make-jpkg b/make-jpkg
index 2c82962..5a788db 100755
--- a/make-jpkg
+++ b/make-jpkg
@@ -63,11 +63,11 @@ fi
 
 ### Parse options
 
-function print_usage() {
+print_usage() {
 	cat << EOF
 Usage: $program_name [OPTION]... FILE
 
-$program_name builds Debian packages from Java(TM) 2 binary distributions.
+$program_name builds Debian packages from Java binary distributions.
 
   --full-name NAME   full name used in the maintainer field of the package
   --email EMAIL      email address used in the maintainer field of the package
@@ -80,7 +80,7 @@ $program_name builds Debian packages from Java(TM) 2 binary distributions.
 EOF
 }
 
-function unrecognized_option() {
+unrecognized_option() {
     cat >&2 << EOF
 $program_name: unrecognized option \`$1'
 Try \`$program_name --help' for more information.
@@ -88,7 +88,7 @@ EOF
     exit 1
 }
 
-function missing_argument() {
+missing_argument() {
     cat >&2 << EOF
 $program_name: missing argument for option \`$1'
 Try \`$program_name --help' for more information.
@@ -154,7 +154,7 @@ failed=
 tmp=
 
 # function is called when script terminates
-function on_exit() {
+on_exit() {
     lastcmd="$_"
     if [[ -z "$success" && -z "$failed" ]]; then
 	cat >&2 << EOF
@@ -173,7 +173,7 @@ EOF
 trap on_exit EXIT
 
 # print error message and terminate
-function error_exit() {
+error_exit() {
     cat >&2 << EOF
 
 Aborted.
@@ -199,11 +199,10 @@ install -d -m 755 "$install_dir"
 
 # load and execute plugins
 echo -n "Loading plugins:"
-cd "$lib_dir"
-files=(*.sh)
+files=($lib_dir/*.sh)
 for file in "${files[@]}"; do
     echo -n " $file"
-    source "$lib_dir/$file"
+    source "$file"
 done
 
 echo
@@ -211,6 +210,9 @@ echo
 # get architecture information
 get_architecture
 
+jvm_base="/usr/lib/jvm/"
+javadoc_base="/usr/share/doc/"
+
 j2se_found=
 for var in ${!j2se_detect_*}; do 
     eval "\$$var"