Author: kkolinko Date: Sat Jan 2 13:47:10 2010 New Revision: 895191 URL: http://svn.apache.org/viewvc?rev=895191&view=rev Log: Fix calling Tomcat Windows scripts from a directory containg spaces, as noted in https://issues.apache.org/bugzilla/show_bug.cgi?id=48464#c4 by LiuYan
Modified: tomcat/trunk/bin/catalina.bat tomcat/trunk/bin/service.bat tomcat/trunk/bin/shutdown.bat tomcat/trunk/bin/startup.bat tomcat/trunk/bin/version.bat Modified: tomcat/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=895191&r1=895190&r2=895191&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.bat (original) +++ tomcat/trunk/bin/catalina.bat Sat Jan 2 13:47:10 2010 @@ -80,7 +80,7 @@ if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome cd .. set CATALINA_HOME=%cd% -cd %CURRENT_DIR% +cd "%CURRENT_DIR%" :gotHome if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome echo The CATALINA_HOME environment variable is not defined correctly Modified: tomcat/trunk/bin/service.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=895191&r1=895190&r2=895191&view=diff ============================================================================== --- tomcat/trunk/bin/service.bat (original) +++ tomcat/trunk/bin/service.bat Sat Jan 2 13:47:10 2010 @@ -144,4 +144,4 @@ echo The service '%SERVICE_NAME%' has been installed. :end -cd %CURRENT_DIR% +cd "%CURRENT_DIR%" Modified: tomcat/trunk/bin/shutdown.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/shutdown.bat?rev=895191&r1=895190&r2=895191&view=diff ============================================================================== --- tomcat/trunk/bin/shutdown.bat (original) +++ tomcat/trunk/bin/shutdown.bat Sat Jan 2 13:47:10 2010 @@ -28,7 +28,7 @@ if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome cd .. set CATALINA_HOME=%cd% -cd %CURRENT_DIR% +cd "%CURRENT_DIR%" :gotHome if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome echo The CATALINA_HOME environment variable is not defined correctly Modified: tomcat/trunk/bin/startup.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/startup.bat?rev=895191&r1=895190&r2=895191&view=diff ============================================================================== --- tomcat/trunk/bin/startup.bat (original) +++ tomcat/trunk/bin/startup.bat Sat Jan 2 13:47:10 2010 @@ -28,7 +28,7 @@ if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome cd .. set CATALINA_HOME=%cd% -cd %CURRENT_DIR% +cd "%CURRENT_DIR%" :gotHome if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome echo The CATALINA_HOME environment variable is not defined correctly Modified: tomcat/trunk/bin/version.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/version.bat?rev=895191&r1=895190&r2=895191&view=diff ============================================================================== --- tomcat/trunk/bin/version.bat (original) +++ tomcat/trunk/bin/version.bat Sat Jan 2 13:47:10 2010 @@ -28,7 +28,7 @@ if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome cd .. set CATALINA_HOME=%cd% -cd %CURRENT_DIR% +cd "%CURRENT_DIR%" :gotHome if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome echo The CATALINA_HOME environment variable is not defined correctly --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org