diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2013-01-31 16:22:11 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2013-01-31 16:22:11 +0000 |
| commit | 508b2ff2628cc1f03ab8572ecdad4d201eeec515 (patch) | |
| tree | 2fab596bf92f159f160a8caaac5e92512c56b327 | |
| parent | Add support for icedtea-web with selectable jvm (diff) | |
| download | eselect-java-508b2ff2628cc1f03ab8572ecdad4d201eeec515.tar.gz eselect-java-508b2ff2628cc1f03ab8572ecdad4d201eeec515.tar.bz2 eselect-java-508b2ff2628cc1f03ab8572ecdad4d201eeec515.zip | |
Use @ as plugin vm seperator
svn path=/projects/eselect-java/trunk/; revision=9169
| -rw-r--r-- | src/modules/java-nsplugin.eselect.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/java-nsplugin.eselect.in b/src/modules/java-nsplugin.eselect.in index 04cf413..554a0bd 100644 --- a/src/modules/java-nsplugin.eselect.in +++ b/src/modules/java-nsplugin.eselect.in @@ -26,7 +26,7 @@ is_multilib() { get_icedtea_web_targets() { local vm for vm in $(echo /usr/lib/jvm/icedtea-*); do - echo "icedtea-web-$(basename ${vm})" + echo "icedtea-web@$(basename ${vm})" done } @@ -75,7 +75,7 @@ get_system_plugin_vm() { if [[ ${plugin} == icedtea-web ]]; then local icedtea=$(readlink "${ICEDTEA_WEB_VM}") - echo "${plugin}-$(basename ${icedtea})" + echo "${plugin}@$(basename ${icedtea})" else echo ${plugin} fi @@ -184,7 +184,7 @@ do_set() { fi local plugin - if [[ ${vm} == icedtea-web-* ]]; then + if [[ ${vm} == icedtea-web@* ]]; then plugin="${PLUGINS_HOME}/icedtea-web-javaplugin.so" else plugin="${PLUGINS_HOME}/${vm}-javaplugin.so" @@ -209,8 +209,8 @@ do_set() { die -q "Sorry, you don't have enough permission to set nsplugin" fi - if [[ ${vm} == icedtea-web-* ]]; then + if [[ ${vm} == icedtea-web@* ]]; then rm -f "${ICEDTEA_WEB_VM}" - ln -sf "${EROOT}"/usr/lib/jvm/${vm#icedtea-web-} "${ICEDTEA_WEB_VM}" + ln -sf "${EROOT}"/usr/lib/jvm/${vm#icedtea-web@} "${ICEDTEA_WEB_VM}" fi } |