Add {mozilla,firefox}-javaplugin.so for update-java-alternatives.

[sven/java-package.git] / lib / oracle-j2re.sh

diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index 3f837a73ad8b68eea6e7c1c70400d8472cfc92f3..f371e179994810de2b93129376a0c563901c177b 100644 (file)
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -2,14 +2,14 @@
 j2se_detect_oracle_j2re=oracle_j2re_detect
 oracle_j2re_detect() {
 
-  if [[ $archive_name =~ jre-([0-9]+)u([0-9]+)-linux-(i586|x64)\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ jre-([0-9]+)u([0-9]+)-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[2]}
     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
@@ -19,7 +19,7 @@ oracle_j2re_detect() {
         if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi
         ;;
       amd64|x86_64-linux-gnu)
-        if [[ "$j2se_arch" != "x64" ]]; then compatible=0; fi
+        if [[ "$j2se_arch" != "x64" && "$j2se_arch" != "amd64" ]]; then compatible=0; fi
         ;;
     esac
 
@@ -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
 }
 
@@ -101,5 +105,7 @@ EOF
     jinfos "hl" $jvm_base$j2se_name/lib/ $oracle_jre_lib_hl
     echo "plugin iceweasel-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
     echo "plugin chromium-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    echo "plugin mozilla-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    echo "plugin firefox-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
 }