[tomcat8] 04/04: Fixed the installation error when JAVA_OPTS contains % (Closes: #770911)

[Emmanuel Bourg]

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

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

commit 7664221d66701e2c31a31fe3b4f22e8bea4158dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 7 16:19:01 2016 +0100

    Fixed the installation error when JAVA_OPTS contains % (Closes: #770911)
---
 debian/changelog        | 2 ++
 debian/tomcat8.postinst | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 74cbbe3..2bb0e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ tomcat8 (8.5.9-1) UNRELEASED; urgency=medium
     - Refreshed the patches
   * Restored the classloading from the common, server and shared directories
     under CATALINA_BASE (Closes: #847137)
+  * Fixed the installation error when JAVA_OPTS in /etc/default/tomcat8
+    contains the '%' character (Closes: #770911)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 05 Dec 2016 22:47:09 +0100
 
diff --git a/debian/tomcat8.postinst b/debian/tomcat8.postinst
index 47d9f70..b6d55d1 100644
--- a/debian/tomcat8.postinst
+++ b/debian/tomcat8.postinst
@@ -19,10 +19,11 @@ case "$1" in
 
 	tmpfile=`mktemp /tmp/tomcat8.XXXXXXXXXX`
 	chmod 644 $tmpfile
+	DELIM=$(printf '\001')
 	cat $TEMPLATE \
 		| sed "s%^TOMCAT8_USER=.*$%TOMCAT8_USER=$TOMCAT8_USER%" \
 		| sed "s%^TOMCAT8_GROUP=.*$%TOMCAT8_GROUP=$TOMCAT8_GROUP%" \
-		| sed "s%^JAVA_OPTS=.*$%JAVA_OPTS=\"$JAVA_OPTS\"%" \
+		| sed "s${DELIM}^JAVA_OPTS=.*\$${DELIM}JAVA_OPTS=\"$JAVA_OPTS\"${DELIM}" \
 		>> $tmpfile
 	ucf --debconf-ok --sum-file /usr/share/tomcat8/defaults.md5sum $tmpfile $CONFFILE
 	rm -f $tmpfile

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