summaryrefslogtreecommitdiff
path: root/Master/bin
diff options
context:
space:
mode:
authorPiotr Strzelczyk <piotr@eps.gda.pl>2009-08-26 21:47:51 +0000
committerPiotr Strzelczyk <piotr@eps.gda.pl>2009-08-26 21:47:51 +0000
commit545ee4e6b4431b325114d22c49fb5970cc178f55 (patch)
tree56211dc222e4086f9673d51b1a8e376dbaeb1c37 /Master/bin
parentf3bcc57bc3bdad3b92083352e49e1b717213435f (diff)
updater-w32 changes:
- all logic related to update preparation moved to tlmgr.pl - batch updater created from an interpolated string in tlmgr.pl with only the necessary commands and simple control flow, no more tricky processing routines there - update is run in a separate cmd.exe process as before but now always with echo on and with all output redirected into a file (or stderr in debug mode: tlmgr -v ...); the only user visible messages are those explicitly redirected to con:[sole] device git-svn-id: svn://tug.org/texlive/trunk@14869 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/bin')
-rwxr-xr-xMaster/bin/win32/tlmgr.bat12
1 files changed, 8 insertions, 4 deletions
diff --git a/Master/bin/win32/tlmgr.bat b/Master/bin/win32/tlmgr.bat
index 2d411d1a92d..193d1b81d92 100755
--- a/Master/bin/win32/tlmgr.bat
+++ b/Master/bin/win32/tlmgr.bat
@@ -26,13 +26,17 @@ if not exist "%tlupdater%" goto :eof
rem Rename updater script before it is run
move /y "%tlupdater%" "%tlupdater%.bat">nul
if errorlevel 1 goto :err_rename_updater
-rem Run updater
-call "%tlupdater%.bat" & goto :eof
+rem Run updater and don't return
+"%tlupdater%.bat"
+
+rem This should never execute
+echo %~nx0: this message should never show up, please report it to tex-live@tug.org>&2
+exit /b 1
:err_updater_exists
-echo %~nx0: locked updater script detected, infrastructure update might be running>&2
+echo %~nx0: failed to remove previous updater script>&2
exit /b 1
:err_rename_updater
-echo %~nx0: failed to move "%tlupdater%">&2
+echo %~nx0: failed to rename "%tlupdater%">&2
exit /b 1