branch changes that never made it into the trunk

git-svn-id: svn://tug.org/texlive/trunk@13498 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 5 insertions, 7 deletions

diff --git a/Master/install-tl.bat b/Master/install-tl.bat
index 068e3250db8..494835cd6ba 100755
--- a/Master/install-tl.bat
+++ b/Master/install-tl.bat
@@ -5,10 +5,8 @@ rem Copyright 2009 by Tomasz M. Trzeciak
 rem Public Domain

 

 rem First, check if this is DOS based system

-rem in DOS '&' is just a normal character

-echo.>nul & goto continue

-goto DOS

-:continue

+rem in DOS '^' is just a normal character

+if not ^x==x goto DOS

 

 rem Now check for Windows NT which is also not supported

 ver | find "NT"

@@ -33,7 +31,7 @@ set PERL5LIB=%~dp0tlpkg\tlperl\lib
 rem Start installer

 path

 perl "%~dpn0" %*

-pause Done

+pause

 goto :eof

 

 rem Subroutine to build search path without tex directories 

@@ -43,7 +41,7 @@ shift
 rem The first argument (";") serves as a marker to reset the path

 if "%~0"==";" set path=

 rem Finish if no more arguments to process

-if "%~1"=="" goto :eof

+if [%1]==[] goto :eof

 rem Continue if tex dir

 if exist "%~1\pdftex.exe" goto :rebuildpath

 rem Add dir to path

@@ -58,7 +56,7 @@ rem The manifest file tells Vista otherwise.
 :UNC

 echo Cannot run from UNC path.

 echo Map network drive to a drive letter and rerun the installer.

-echo Use pushd/popd commands for temporary mapping.

+echo You can use pushd/popd commands for temporary mapping.

 pause

 exit /b 1