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

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 8ebb900..5424360 100755 (executable)
--- 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 3877112..952e141 100755 (executable)
--- 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 7d09b8c..8e48481 100755 (executable)
--- 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 12f0f68..bd074d1 100755 (executable)
--- 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 7d940a2..939ae1c 100755 (executable)
--- 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