[jetty9] 64/99: Added the missing JETTY_CONF variable in debian/jetty8.init

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit b7af5747a3ef9acef09c28e1ef0644a52609c9b3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 11 11:10:36 2014 +0200

    Added the missing JETTY_CONF variable in debian/jetty8.init
---
 debian/changelog   | 1 +
 debian/jetty8.init | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 28d3e14..055fd3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ jetty8 (8.1.15-1) UNRELEASED; urgency=medium
   * debian/rules: Install the upstream changelog
   * debian/watch: Watch the tags from the Git repository
   * debian/jetty-shared-webapps.xml: Updated the path of the webapps directory
+  * debian/jetty8.init: Added the missing JETTY_CONF variable
   * Switch to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Jul 2014 16:01:22 +0200
diff --git a/debian/jetty8.init b/debian/jetty8.init
index bf7cccf..03071b5 100644
--- a/debian/jetty8.init
+++ b/debian/jetty8.init
@@ -216,7 +216,8 @@ if [ -z "$JAVA_HOME" ]; then
 	exit 0
 fi
 
-CONFIG_LINES=$(cat /etc/jetty8/jetty.conf | grep -v "^[[:space:]]*#" | tr "\n" " ")
+JETTY_CONF=/etc/jetty8/jetty.conf
+CONFIG_LINES=$(cat $JETTY_CONF | grep -v "^[[:space:]]*#" | tr "\n" " ")
 
 ##################################################
 # Get the list of config.xml files from jetty.conf

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