[java-wrappers] 45/61: [java-wrappers] lift the assumption that alternatives are in /usr/lib/jvm

[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 e314d93f16f865461be48ebbd70d8c2b39e2d5ca
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed Jun 19 19:52:17 2013 +0000

    [java-wrappers] lift the assumption that alternatives are in /usr/lib/jvm
---
 debian/changelog | 4 +++-
 jvm-list.sh      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81ee10e..be045d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ java-wrappers (0.1.26) unstable; urgency=low
 
   * Fix run_jar (closes: #709976) (and, yes, it is fixed on a Wednesday,
     though not the one announced initially ;-) ...)
+  * Lift the assumption that alternatives live in /usr/lib/jvm (closes:
+    #711850)
 
- -- Vincent Fourmond <fourmond at debian.org>  Wed, 19 Jun 2013 21:30:54 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 19 Jun 2013 21:50:43 +0200
 
 java-wrappers (0.1.25) unstable; urgency=low
 
diff --git a/jvm-list.sh b/jvm-list.sh
index ddb5daf..b634b85 100644
--- a/jvm-list.sh
+++ b/jvm-list.sh
@@ -56,7 +56,7 @@ __jvm_java5="$__jvm_gcj5 $__jvm_java6"
 __jvm_java2="$__jvm_java5 $__jvm_gcj2"
 
 # current java alternatives
-__jvm_alt=$(readlink /etc/alternatives/java|sed -n 's/\(\/usr\/lib\/jvm\/[^\/]*\)\/.*/\1/p')
+__jvm_alt=$(readlink /etc/alternatives/java|sed -n 's!\(.*\)/bin/[^/]*$!\1!p')
 
 # All JVMs
 __jvm_all="$__jvm_default /usr/lib/jvm/*"

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