| 1 |
commit: 52f8ec9e99886ae994eb1f5226d5657c29d9f8be |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 30 20:17:00 2015 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 31 23:55:57 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=52f8ec9e |
| 7 |
|
| 8 |
Treat javaws as a special case in run-java-tool |
| 9 |
|
| 10 |
We used to have to install dangling symlinks with icedtea(-bin) |
| 11 |
pointing to a subsequent installation of icedtea-web. This was |
| 12 |
convoluted and didn't make sense as Oracle's VM can also be used |
| 13 |
against icedtea-web. Now we always run icedtea-web's javaws if it is |
| 14 |
installed. Those wanting Oracle's javaws can simply uninstall |
| 15 |
icedtea-web. |
| 16 |
|
| 17 |
src/scripts/run-java-tool.bash.in | 7 ++++++- |
| 18 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/src/scripts/run-java-tool.bash.in b/src/scripts/run-java-tool.bash.in |
| 21 |
index 6bccac0..bfd5130 100644 |
| 22 |
--- a/src/scripts/run-java-tool.bash.in |
| 23 |
+++ b/src/scripts/run-java-tool.bash.in |
| 24 |
@@ -1,5 +1,11 @@ |
| 25 |
#!@GENTOO_PORTAGE_EPREFIX@/bin/sh |
| 26 |
|
| 27 |
+tool=${0##*/} |
| 28 |
+ |
| 29 |
+if [ "${tool}" = "javaws" ] && [ -x "@GENTOO_PORTAGE_EPREFIX@/usr/bin/itweb-javaws" ]; then |
| 30 |
+ exec "@GENTOO_PORTAGE_EPREFIX@/usr/bin/itweb-javaws" "${@}" |
| 31 |
+fi |
| 32 |
+ |
| 33 |
user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm" |
| 34 |
system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm" |
| 35 |
|
| 36 |
@@ -15,7 +21,6 @@ else |
| 37 |
fi |
| 38 |
|
| 39 |
vm_handle=${vmpath##*/} |
| 40 |
-tool=${0##*/} |
| 41 |
|
| 42 |
toolpath=$( |
| 43 |
export PATH= |
Archives