X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-jdk.sh;h=f12d95f59ee783089f6f74c722f820cbbad66093;hp=99c6287f4b05b0b7d9f1a4b52bb79eb86cd6ba1e;hb=0c26a5b2161d8f4e915e2e21fa923fa2f24a6daf;hpb=f03071c526a332c9650568cb1f32361c96fef9d8

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 99c6287..f12d95f 100644
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -13,6 +13,10 @@ oracle_j2sdk_detect() {
       j2se_version=${j2se_release}${j2se_update}${revision}
       j2se_expected_min_size=340 #Mb
       j2se_binary_subdir="/bin"
+      oracle_no_man_jre_bin_jre="appletviewer idlj jaotc jar jarsigner java javac javadoc javah javap javapackager javaws jcmd jconsole jcontrol jdb jdeprscan jdeps jhsdb jimage jinfo jjs jlink jmap jmc jmod jps jrunscript jshell jstack jstat jstatd jweblauncher keytool orbd pack200 policytool rmic rmid rmiregistry schemagen serialver servertool tnameserv unpack200 wsgen wsimport xjc"
+      oracle_bin_jdk=" "
+      oracle_jre_bin_hl=" "
+      oracle_jre_bin_jre=" "
   fi
 
   # Update or GA release (jdk-7u15-linux-i586.tar.gz)
@@ -110,14 +114,14 @@ EOF
         oracle_jre_bin_hl="java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
         oracle_jre_bin_jre="policytool"
       else
-        oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
-        oracle_jre_bin_jre="javaws policytool"
+        oracle_jre_bin_hl="${oracle_jre_bin_hl:-java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool}"
+        oracle_jre_bin_jre="${oracle_jre_bin_jre:-javaws policytool}"
       fi
       if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
-        oracle_no_man_jre_bin_jre="ControlPanel jcontrol"
+        oracle_no_man_jre_bin_jre="${oracle_no_man_jre_bin_jre:-ControlPanel jcontrol}"
       fi
       oracle_jre_lib_hl="jexec"
-      oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jmc jps jrunscript jsadebugd jstack jstat jstatd jvisualvm native2ascii rmic schemagen serialver wsgen wsimport xjc"
+      oracle_bin_jdk="${oracle_bin_jdk:-appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jmc jps jrunscript jsadebugd jstack jstat jstatd jvisualvm native2ascii rmic schemagen serialver wsgen wsimport xjc}"
       j2se_package="$j2se_vendor-java$j2se_release-jdk"
       j2se_binary_subdir="${j2se_binary_subdir:-/jre/bin}"
       j2se_run