Wrapper scripts did not detect WINNT value of dynamic OS environment

variable when logged into workstations using Novell authentication.
PR: 30366
Obtained from: Dave Brondsema


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276732 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -37,6 +37,7 @@ Dan Armbrust
 Daniel Spilker
 Danno Ferrin
 Davanum Srinivas
+Dave Brondsema
 David A. Herman
 David Kavanagh
 David Maclean

WHATSNEW

@@ -10,6 +10,10 @@ Fixed bugs:
 * Translate task does not remove tokens when a key is not found.
   It logs a verbose message.  Bugzilla Report 13936.
 
+* Wrapper scripts did not detect WINNT value of dynamic OS environment
+  variable when logged into workstations using Novell authentication.
+  Bugzilla Report 30366.
+
 Other changes:
 --------------
 

src/script/ant.bat

@@ -17,6 +17,7 @@ REM  limitations under the License.
 if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
 
 if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
 
 rem %~dp0 is expanded pathname of the current script under NT
 set DEFAULT_ANT_HOME=%~dp0..
@@ -100,6 +101,7 @@ set _JAVACMD=
 set ANT_CMD_LINE_ARGS=
 
 if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
 
 :mainEnd
 if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"

src/script/antRun.bat

@@ -18,16 +18,22 @@ REM
 REM
 
 if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
 
 if ""%1""=="""" goto runCommand
 
 rem Change drive and directory to %1
-if "%OS%"=="Windows_NT" cd /d ""%1""
-if not "%OS%"=="Windows_NT" cd ""%1""
+if "%OS%"=="Windows_NT" goto nt_cd
+if "%OS%"=="WINNT" goto nt_cd
+cd ""%1""
+goto end_cd
+:nt_cd
+cd /d ""%1""
+:end_cd
 shift
 
 rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of agruments (up to the command line limit, anyway).
+rem of arguments (up to the command line limit, anyway).
 set ANT_RUN_CMD=%1
 if ""%1""=="""" goto runCommand
 shift
@@ -42,4 +48,5 @@ rem echo %ANT_RUN_CMD%
 %ANT_RUN_CMD%
 
 if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal