This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new f3e3217 Fix calling service.bat from CATALINA_HOME
f3e3217 is described below
commit f3e32170d5d331ad38a86bda37f5911ef8a8a734
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 29 15:16:04 2020 +0100
Fix calling service.bat from CATALINA_HOME
---
bin/service.bat | 4 ++--
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bin/service.bat b/bin/service.bat
index b170e64..b6a2d86 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -75,8 +75,8 @@ rem Check the environment
rem Guess CATALINA_HOME if not defined
if not "%CATALINA_HOME%" == "" goto gotHome
set "CATALINA_HOME=%cd%"
-if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto okHome
-if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto okHome
+if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto gotHome
+if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto gotHome
rem CD to the upper dir
cd ..
set "CATALINA_HOME=%cd%"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0f65809..0e3ff4c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -95,6 +95,10 @@
Updated to Ant 1.9.1. The build now requires a minimum of Ant 1.9.1.
(markt)
</update>
+ <fix>
+ Fix running service.bat when called from <code>$CATALINA_HOME</code>.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
