[javatools] 01/05: jarwrapper: fix manifest parsing and wrapping long lines (Closes: #729943)

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch master
in repository javatools.

commit 3fa40d1
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Wed Mar 19 00:25:47 2014

    jarwrapper: fix manifest parsing and wrapping long lines (Closes: #729943)
    
     * Added "${perl:Depends}" to jarwrapper's Depends.
---
 debian/control | 2 +-
 jarwrapper     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 54af05f..9554d1b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/javatools.git
 
 Package: jarwrapper
 Architecture: all
-Depends: binfmt-support, fastjar, ${misc:Depends}
+Depends: binfmt-support, fastjar, ${misc:Depends}, ${perl:Depends}
 Description: Run executable Java .jar files
  Jarwrapper sets up binfmt-misc to run executable jar files
  using the installed java runtime.
diff --git a/jarwrapper b/jarwrapper
index e48002f..5986233 100755
--- a/jarwrapper
+++ b/jarwrapper
@@ -15,8 +15,8 @@ TEMP="`mktemp -d`"
 
 (cd "$TEMP"; fastjar xf "$JAR" META-INF/MANIFEST.MF)
 
-NEW_JAVA_HOMES="`sed -n '/^Debian-Java-Home:/s/^[^:]*: *//p' "$TEMP/META-INF/MANIFEST.MF"`"
-JAVAOPTS="`sed -n '/^Debian-Java-Parameters:/s/^[^:]*: *//p' "$TEMP/META-INF/MANIFEST.MF"`"
+NEW_JAVA_HOMES="$(perl -0nE 's{\r?\n\s}{}gsm; print $1 if m{^Debian-Java-Home:\s*([^\r\n]+)}m;' "$TEMP/META-INF/MANIFEST.MF")"
+JAVAOPTS="$(perl -0nE 's{\r?\n\s}{}gsm; print $1 if m{^Debian-Java-Parameters:\s*([^\r\n]+)}m;' "$TEMP/META-INF/MANIFEST.MF")"
 rm -rf "$TEMP"
 
 for i in $NEW_JAVA_HOMES; do 

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