[SCM] tomcat6 packaging branch, master, updated. debian/6.0.35-3-1-g4583a99

[tony mancill]

The following commit has been merged in the master branch:
commit 4583a99ce545ec5ac334ef97c8be76ab1210320e
Author: tony mancill <tmancill at debian.org>
Date:   Fri May 4 22:04:28 2012 -0700

    apply patch for #671373, #299635

diff --git a/debian/changelog b/debian/changelog
index 2cbedce..84ae7ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tomcat6 (6.0.35-4) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Apply patch from James Page (Closes: #671373)
+    - d/tomcat6-instance-create: Quote access to files and directories
+      so that spaces can be used when creating user instances.
+    - d/tomcat6.init: Make NAME dynamic, to allow starting multiple
+      instances. (Closes: #299635)
+
+ -- tony mancill <tmancill at debian.org>  Fri, 04 May 2012 21:46:58 -0700
+
 tomcat6 (6.0.35-3) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff --git a/debian/tomcat6-instance-create b/debian/tomcat6-instance-create
index 8e06503..433b634 100644
--- a/debian/tomcat6-instance-create
+++ b/debian/tomcat6-instance-create
@@ -117,38 +117,38 @@ if [ ${warned} -eq 1 ]; then
   read answer
 fi
 
-mkdir -p ${TARGET}
+mkdir -p "${TARGET}"
 
-FULLTARGET=`cd ${TARGET} > /dev/null && pwd`
+FULLTARGET=`cd "${TARGET}" > /dev/null && pwd`
 
-mkdir ${TARGET}/conf
-mkdir ${TARGET}/logs
-mkdir ${TARGET}/webapps
-mkdir ${TARGET}/work
-mkdir ${TARGET}/temp
-cp -r /usr/share/tomcat6/skel/* ${TARGET}
+mkdir "${TARGET}/conf"
+mkdir "${TARGET}/logs"
+mkdir "${TARGET}/webapps"
+mkdir "${TARGET}/work"
+mkdir "${TARGET}/temp"
+cp -r /usr/share/tomcat6/skel/* "${TARGET}"
 
 # Create necessary symbolic links so that eclipse can be properly configured
-ln -s /usr/share/tomcat6/lib ${TARGET}/lib
-ln -s /usr/share/tomcat6/bin/bootstrap.jar ${TARGET}/bin/bootstrap.jar
+ln -s /usr/share/tomcat6/lib "${TARGET}/lib"
+ln -s /usr/share/tomcat6/bin/bootstrap.jar "${TARGET}/bin/bootstrap.jar"
 
-sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" ${TARGET}/conf/server.xml
+sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml"
 
-cat > ${TARGET}/bin/startup.sh << EOT
+cat > "${TARGET}/bin/startup.sh" << EOT
 #!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE="${FULLTARGET}"
 /usr/share/tomcat6/bin/startup.sh
 echo "Tomcat started"
 EOT
 
-cat > ${TARGET}/bin/shutdown.sh << EOT
+cat > "${TARGET}/bin/shutdown.sh" << EOT
 #!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE="${FULLTARGET}"
 /usr/share/tomcat6/bin/shutdown.sh
 echo "Tomcat stopped"
 EOT
 
-chmod a+x ${TARGET}/bin/startup.sh ${TARGET}/bin/shutdown.sh
+chmod a+x "${TARGET}/bin/startup.sh" "${TARGET}/bin/shutdown.sh"
 echo "* New Tomcat instance created in ${TARGET}"
 echo "* You might want to edit default configuration in ${TARGET}/conf"
 echo "* Run ${TARGET}/bin/startup.sh to start your Tomcat instance"
diff --git a/debian/tomcat6.init b/debian/tomcat6.init
index c5bb175..c121552 100644
--- a/debian/tomcat6.init
+++ b/debian/tomcat6.init
@@ -23,7 +23,7 @@
 set -e
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=tomcat6
+NAME="$(basename "$0" | sed 's/^[KS][0-9]\{2\}//')"
 DESC="Tomcat servlet engine"
 DEFAULT=/etc/default/$NAME
 JVM_TMP=/tmp/tomcat6-$NAME-tmp

-- 
tomcat6 packaging