X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=make-jpkg;h=758bcf8db075deae3b15dd00b3c6d970f9fecddf;hp=7173cb5ea7e2e219c7a1e32df8348b1ac7d28f39;hb=2db62a21fffe2ec4479cc496b99e4abcbc350895;hpb=8e310b0345eb38774e18c08db490286fdae63093 diff --git a/make-jpkg b/make-jpkg index 7173cb5..758bcf8 100755 --- a/make-jpkg +++ b/make-jpkg @@ -15,8 +15,8 @@ lib_dir="/usr/share/java-package" [ "$J2SE_PACKAGE_LIBDIR" ] && lib_dir="$J2SE_PACKAGE_LIBDIR" # If a default has been set for either of the -# environment variables, use it; otherwise, -# default to the name and email used by the +# environment variables, use it; otherwise, +# default to the name and email used by the # Debian Java Maintainers project. if [ -z "$J2SE_PACKAGE_FULL_NAME" ]; then maintainer_name="Debian Java Maintainers" @@ -219,11 +219,14 @@ echo # get architecture information get_architecture +# get browser plugin directories +get_browser_plugin_dirs + jvm_base="/usr/lib/jvm/" javadoc_base="/usr/share/doc/" j2se_found= -for var in ${!j2se_detect_*}; do +for var in ${!j2se_detect_*}; do eval "\$$var" if [[ "$j2se_found" == "true" ]]; then break; @@ -232,7 +235,8 @@ done echo if [[ -z "$j2se_found" ]]; then - echo "No matching packaging method was found for $archive_name. Please make sure you are using a tar.gz or self-extracting archive" + echo "No matching packaging method was found for $archive_name." + echo "Please make sure you are using a tar.gz or a self-extracting archive" fi