X-Git-Url: http://git.sven.stormbind.net/?a=blobdiff_plain;f=lib%2Foracle-j2re.sh;h=4532c07a6dd6ef5dc5daf722e97e6c1806338773;hb=cdafa49b21a21cdbaa91c64f017e1bfa492780c9;hp=3f837a73ad8b68eea6e7c1c70400d8472cfc92f3;hpb=c1fb4d0a58160b37808c25744cd4e75e2ba5e5ab;p=sven%2Fjava-package.git

diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index 3f837a7..4532c07 100644
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -9,7 +9,7 @@ oracle_j2re_detect() {
     j2se_arch=${BASH_REMATCH[3]}
     j2se_version=$j2se_release.$j2se_update
     j2se_priority=$((310 + $j2se_release - 1))
-    j2se_expected_min_size=95 #Mb
+    j2se_expected_min_size=85 #Mb
 
     # check if the architecture matches
     let compatible=1
@@ -30,33 +30,33 @@ oracle_j2re_detect() {
     fi
 
 
-	cat << EOF
+    cat << EOF
 
 Detected product:
     Java(TM) Runtime Environment (JRE)
     Standard Edition, Version $j2se_release Update $j2se_update
     Oracle(TM)
 EOF
-	if read_yn "Is this correct [Y/n]: "; then
-	    j2se_found=true
-	    j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
-	    j2se_vendor="oracle"
-	    j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)"
+    if read_yn "Is this correct [Y/n]: "; then
+      j2se_found=true
+      j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
+      j2se_vendor="oracle"
+      j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)"
 
-	    j2se_install=oracle_j2re_install
-	    j2se_remove=oracle_j2re_remove
-	    j2se_jinfo=oracle_j2re_jinfo
-	    oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
-	    oracle_jre_bin_jre="javaws policytool"
-	    oracle_no_man_jre_bin_jre="ControlPanel"
-	    oracle_jre_lib_hl="jexec"
-	    j2re_run
-	fi
+      j2se_install=oracle_j2re_install
+      j2se_remove=oracle_j2re_remove
+      j2se_jinfo=oracle_j2re_jinfo
+      oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
+      oracle_jre_bin_jre="javaws policytool"
+      oracle_no_man_jre_bin_jre="ControlPanel"
+      oracle_jre_lib_hl="jexec"
+      j2re_run
+    fi
   fi
 }
 
 oracle_j2re_install() {
-	cat << EOF
+    cat << EOF
 if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then
     exit 0
 fi
@@ -69,11 +69,13 @@ install_no_man_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
 install_browser_plugin "/usr/lib/iceweasel/plugins" "libjavaplugin.so" "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 install_browser_plugin "/usr/lib/chromium/plugins" "libjavaplugin.so" "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+install_browser_plugin "/usr/lib/mozilla/plugins" "libjavaplugin.so" "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+install_browser_plugin "/usr/lib/firefox/plugins" "libjavaplugin.so" "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 EOF
 }
 
 oracle_j2re_remove() {
-	cat << EOF
+    cat << EOF
 if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then
     exit 0
 fi
@@ -86,6 +88,8 @@ remove_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
 remove_browser_plugin "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 remove_browser_plugin "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+remove_browser_plugin "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+remove_browser_plugin "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 EOF
 }