Replaced references to "Java 2" by "Java SE"

[sven/java-package.git] / make-jpkg

diff --git a/make-jpkg b/make-jpkg
index 64c37635f7e34254130e7902cfdff326b4c7430d..74c743b21bdcde85c6d9e3fe817e434f391fe968 100755 (executable)
--- a/make-jpkg
+++ b/make-jpkg
@@ -67,7 +67,16 @@ print_usage() {
        cat << EOF
 Usage: $program_name [OPTION]... FILE
 
-$program_name builds Debian packages from Java(TM) 2 binary distributions.
+$program_name builds a Debian package from the given Java binary distribution FILE
+
+Supported java binary distributions currently include:
+  * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
+    - The Java Development Kit (JDK), version 6 (update >= 10), 7
+    - The Java Runtime Environment (JRE), version 6 (update >= 10), 7
+    - The Java API Javadoc, version 6 (update >= 10), 7
+  (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
+
+The following options are recognized:
 
   --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
@@ -199,11 +208,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