From 52f8ec9e99886ae994eb1f5226d5657c29d9f8be Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 30 Dec 2015 20:17:00 +0000 Subject: Treat javaws as a special case in run-java-tool We used to have to install dangling symlinks with icedtea(-bin) pointing to a subsequent installation of icedtea-web. This was convoluted and didn't make sense as Oracle's VM can also be used against icedtea-web. Now we always run icedtea-web's javaws if it is installed. Those wanting Oracle's javaws can simply uninstall icedtea-web. --- src/scripts/run-java-tool.bash.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/scripts/run-java-tool.bash.in b/src/scripts/run-java-tool.bash.in index 6bccac0..bfd5130 100644 --- a/src/scripts/run-java-tool.bash.in +++ b/src/scripts/run-java-tool.bash.in @@ -1,5 +1,11 @@ #!@GENTOO_PORTAGE_EPREFIX@/bin/sh +tool=${0##*/} + +if [ "${tool}" = "javaws" ] && [ -x "@GENTOO_PORTAGE_EPREFIX@/usr/bin/itweb-javaws" ]; then + exec "@GENTOO_PORTAGE_EPREFIX@/usr/bin/itweb-javaws" "${@}" +fi + user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm" system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm" @@ -15,7 +21,6 @@ else fi vm_handle=${vmpath##*/} -tool=${0##*/} toolpath=$( export PATH= -- cgit v1.2.3-65-gdbad