[med-svn] [imagej] 01/02: Fix wrapper script

[Andreas Tille]

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

tille pushed a commit to branch master
in repository imagej.

commit 952954f1b053c3093e644112cb5406f88ff9d153
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 7 14:57:12 2016 +0200

    Fix wrapper script
---
 debian/changelog | 3 +++
 debian/imagej.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aaa8ed7..077b6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ imagej (1.50i+dfsg-1) UNRELEASED; urgency=medium
   * Use new uscan options in d/watch
   * Spelling error in debian/README.Debian
   * Remove menu file
+  * Fix wrapper script (thanks for the patch to Kai Wohlfahrt
+    <kai.scorpio at gmail.com>)
+    Closes: #820097
 
  -- Andreas Tille <tille at debian.org>  Thu, 07 Apr 2016 10:45:33 +0200
 
diff --git a/debian/imagej.sh b/debian/imagej.sh
index 936827a..3696a0a 100644
--- a/debian/imagej.sh
+++ b/debian/imagej.sh
@@ -29,7 +29,7 @@ shopt -s extglob # allow extended pattern matching
 
 if [ -z "$JAVA_HOME" ] ; then
     # This does not work see #505315
-    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | grep openjdk | sort | tail -1 | cut -d' ' -f 3)
+    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | grep openjdk | sort | tail -1 | tr -s ' ' | cut -d' ' -f 3)
     # Reverted to old version - see #558222 (Andreas Tille)
     # JAVA_HOME=$(dirname $(dirname $(dirname $(readlink /etc/alternatives/java))))
     # Also suggested by From: JR Coding <jr.coding at googlemail.com>; To: 740439 at bugs.debian.org

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/imagej.git