From d8d68d106f02e1772ff0fe381fa9e7994b1d82d1 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Sat, 2 Jan 2010 13:47:10 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@895191 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.bat | 2 +- bin/service.bat | 2 +- bin/shutdown.bat | 2 +- bin/startup.bat | 2 +- bin/version.bat | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index 8ebb900b6..542436077 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -80,7 +80,7 @@ set CATALINA_HOME=%CURRENT_DIR% 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 diff --git a/bin/service.bat b/bin/service.bat index 3877112d9..952e14179 100755 --- a/bin/service.bat +++ b/bin/service.bat @@ -144,4 +144,4 @@ set PR_STDERROR=auto echo The service '%SERVICE_NAME%' has been installed. :end -cd %CURRENT_DIR% +cd "%CURRENT_DIR%" diff --git a/bin/shutdown.bat b/bin/shutdown.bat index 7d09b8c74..8e4848142 100755 --- a/bin/shutdown.bat +++ b/bin/shutdown.bat @@ -28,7 +28,7 @@ set CATALINA_HOME=%CURRENT_DIR% 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 diff --git a/bin/startup.bat b/bin/startup.bat index 12f0f6831..bd074d159 100755 --- a/bin/startup.bat +++ b/bin/startup.bat @@ -28,7 +28,7 @@ set CATALINA_HOME=%CURRENT_DIR% 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 diff --git a/bin/version.bat b/bin/version.bat index 7d940a230..939ae1cd8 100755 --- a/bin/version.bat +++ b/bin/version.bat @@ -28,7 +28,7 @@ set CATALINA_HOME=%CURRENT_DIR% 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 -- 2.11.0