From 33baef98437e76c0c01a65ccc2eae789b6d11969 Mon Sep 17 00:00:00 2001 From: Piotr Strzelczyk Date: Mon, 11 May 2009 16:40:16 +0000 Subject: simpler DOS detection; modified start-up of tl-portable shell git-svn-id: svn://tug.org/texlive/branches/branch2009-dev@13045 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl.bat | 8 +++----- Master/tl-portable.bat | 16 +++++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Master/install-tl.bat b/Master/install-tl.bat index 068e3250db8..c743e17ca8b 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" @@ -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 diff --git a/Master/tl-portable.bat b/Master/tl-portable.bat index 98a52b2725c..ee0d12167d3 100755 --- a/Master/tl-portable.bat +++ b/Master/tl-portable.bat @@ -3,10 +3,8 @@ rem Copyright 2008-2009 Siep Kroonenberg, Tomasz M. Trzeciak. rem You may freely use, modify and/or distribute this file. 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" @@ -56,9 +54,9 @@ path %TEXDIR%tlpkg\tlperl\bin;%TEXDIR%bin\win32;%path% perl "%TEXDIR%install-tl" --portable if errorlevel 1 goto failedinit -rem start command interperter -set PROMPT=TL $P$G -%COMSPEC% /k +rem start new command interperter with customized prompt and window title +rem reuse existing console but without blocking the parent process +start "TL-SHELL" /b "%ComSpec%" /k "title TL-SHELL& prompt TL %prompt%" goto :eof :failedinit @@ -68,8 +66,8 @@ exit /b 1 :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 Map network drive to a drive letter and rerun the script. +echo You can use pushd/popd commands for temporary mapping. pause exit /b 1 -- cgit v1.2.3