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]}
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
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"
+for b in $browser_plugin_dirs;do
+ install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
EOF
}
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"
+for b in $browser_plugin_dirs;do
+ remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
EOF
}
jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_jre_bin_jre
jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_no_man_jre_bin_jre
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"
+ for b in $browser_plugin_dirs;do
+ echo "plugin $b-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+ done
}