From 776602d6bc9a28c022f2b068fce0b89da8cac3d8 Mon Sep 17 00:00:00 2001 From: mturk Date: Fri, 12 Mar 2010 15:52:09 +0000 Subject: [PATCH] Use TEMP environment for storing the autoresponse file, and make sure the file was created git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@922301 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.bat | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index 7b1ab7b11..cf015f53a 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -80,16 +80,18 @@ rem --------------------------------------------------------------------------- rem Suppress Terminate batch job on CTRL+C if not ""%1"" == ""run"" goto mainEntry -if exist "%~dp0run" goto mainEntry -echo Y >"%~dp0run" -echo Y >"%~dp0yes" -call "%~f0" %* <"%~dp0yes" +if ""%TEMP%"" == """" goto mainEntry +if exist "%TEMP%\%~nx0.run" goto mainEntry +echo Y>"%TEMP%\%~nx0.run" +if not exist "%TEMP%\%~nx0.run" goto mainEntry +echo Y>"%TEMP%\%~nx0.Y" +call "%~f0" %* <"%TEMP%\%~nx0.Y" rem Use provided errorlevel set RETVAL=%ERRORLEVEL% -del /Q "%~dp0yes" >NUL 2>&1 +del /Q "%TEMP%\%~nx0.Y" >NUL 2>&1 exit /B %RETVAL% :mainEntry -del /Q "%~dp0run" >NUL 2>&1 +del /Q "%TEMP%\%~nx0.run" >NUL 2>&1 rem Guess CATALINA_HOME if not defined set "CURRENT_DIR=%cd%" -- 2.11.0