[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.26-1-5-g755970c

[tony mancill]

The following commit has been merged in the master branch:
commit 0468d0c57f91c82fc3c544fcbff1495f2e5fc114
Author: tony mancill <tmancill at debian.org>
Date:   Thu Apr 12 20:03:12 2012 -0700

    apply patch totomcat7-instance-create to handle paths with spaces; closes #668362

diff --git a/debian/tomcat7-instance-create b/debian/tomcat7-instance-create
index c773809..5abd752 100644
--- a/debian/tomcat7-instance-create
+++ b/debian/tomcat7-instance-create
@@ -106,34 +106,34 @@ 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/tomcat7/skel/* ${TARGET}
+mkdir "${TARGET}/conf"
+mkdir "${TARGET}/logs"
+mkdir "${TARGET}/webapps"
+mkdir "${TARGET}/work"
+mkdir "${TARGET}/temp"
+cp -r /usr/share/tomcat7/skel/* "${TARGET}"
 
-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/tomcat7/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/tomcat7/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"

-- 
tomcat7: Servlet and JSP engine