[java-wrappers] 29/61: add java-alternatives jvm to find_java_runtime() when no args

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java-wrappers.

commit 228148bda1c13a8a2c537ee733be0fac84fc4b1b
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jan 12 21:21:07 2011 +0000

    add java-alternatives jvm to find_java_runtime() when no args
---
 debian/changelog | 6 ++++++
 jvm-list.sh      | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e639797..b8e5f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+java-wrappers (0.1.17) UNRELEASED; urgency=low
+
+  * REMOVEME toward java-alternatives integration (will close #609731).
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 12 Jan 2011 22:18:19 +0100
+
 java-wrappers (0.1.16) unstable; urgency=low
 
   * Adding default as a valid jre choice, and make it the default for
diff --git a/jvm-list.sh b/jvm-list.sh
index b008499..0ed1f83 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -62,8 +62,10 @@ __jvm_java5="$__jvm_gcj5 $__jvm_java6 $__jvm_sun5"
 # -> corresponds to Provides: java2-runtime 
 __jvm_java2="$__jvm_java5 $__jvm_gcj2"
 
+# current java alternatives
+__jvm_alt=$(readlink /etc/alternatives/java|sed -n 's/\(\/usr\/lib\/jvm\/[^\/]*\)\/.*/\1/p')
 
 # All JVMs
-__jvm_all="$__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"
+__jvm_all="$__jvm_alt $__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"
 
 # Probably here should come a few meaningful global aliases.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-wrappers.git