← Back to branch summary

~ubuntu-branches/ubuntu/natty/tomcat6/natty-proposed

« back to all changes in this revision

Viewing changes to bin/startup.bat

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-05-21 13:51:15 UTC
  • mfrom: (2.2.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100521135115-qfwnf24lzvi3644v
Tags: 6.0.26-2
http://bugs.debian.org/581018
https://launchpad.net/bugs/557300
https://launchpad.net/bugs/569118
* debian/tomcat6.{postinst,prerm}: Respect TOMCAT6_USER and TOMCAT6_GROUP
  as defined in /etc/default/tomcat6 when setting directory permissions and
  authbind configuration (Closes: #581018, LP: #557300)
* debian/tomcat6.postinst: Use group "tomcat6" instead of "adm" for
  permissions in /var/lib/tomcat6, so that group "adm" doesn't get write
  permissions over /var/lib/tomcat6/webapps (LP: #569118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/startup.bat
18
18
rem ---------------------------------------------------------------------------
19
19
rem Start script for the CATALINA Server
20
20
rem
21
 
rem $Id: startup.bat 562770 2007-08-04 22:13:58Z markt $
 
21
rem $Id: startup.bat 908749 2010-02-10 23:26:42Z markt $
22
22
rem ---------------------------------------------------------------------------
23
23
 
24
24
rem Guess CATALINA_HOME if not defined
25
 
set CURRENT_DIR=%cd%
 
25
set "CURRENT_DIR=%cd%"
26
26
if not "%CATALINA_HOME%" == "" goto gotHome
27
 
set CATALINA_HOME=%CURRENT_DIR%
 
27
set "CATALINA_HOME=%CURRENT_DIR%"
28
28
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
29
29
cd ..
30
 
set CATALINA_HOME=%cd%
31
 
cd %CURRENT_DIR%
 
30
set "CATALINA_HOME=%cd%"
 
31
cd "%CURRENT_DIR%"
32
32
:gotHome
33
33
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
34
34
echo The CATALINA_HOME environment variable is not defined correctly
36
36
goto end
37
37
:okHome
38
38
 
39
 
set EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat
 
39
set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat"
40
40
 
41
41
rem Check that target executable exists
42
42
if exist "%EXECUTABLE%" goto okExec
43
 
echo Cannot find %EXECUTABLE%
 
43
echo Cannot find "%EXECUTABLE%"
44
44
echo This file is needed to run this program
45
45
goto end
46
46
:okExec