diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2015-12-30 20:17:00 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2015-12-31 23:55:57 +0000 |
| commit | 52f8ec9e99886ae994eb1f5226d5657c29d9f8be (patch) | |
| tree | 32c4bd0c0ec1d682145b164b166e6818c8fcfeac | |
| parent | Utilise the VM's PATH variable in run-java-tool (diff) | |
| download | eselect-java-52f8ec9e99886ae994eb1f5226d5657c29d9f8be.tar.gz eselect-java-52f8ec9e99886ae994eb1f5226d5657c29d9f8be.tar.bz2 eselect-java-52f8ec9e99886ae994eb1f5226d5657c29d9f8be.zip | |
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.
| -rw-r--r-- | src/scripts/run-java-tool.bash.in | 7 |
1 files changed, 6 insertions, 1 deletions
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= |