summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorPiotr Strzelczyk <piotr@eps.gda.pl>2009-08-14 08:22:40 +0000
committerPiotr Strzelczyk <piotr@eps.gda.pl>2009-08-14 08:22:40 +0000
commitc222930ca9bdfae4d25e47449f4fef14e163e7cc (patch)
treef2a465c646ee1d8592ce76f5599e6dd0e70af996 /Master
parenta117dd391ce40a6f9bce4e14ea97b79bb7ed6d37 (diff)
fix for echoing poison characters in paths
git-svn-id: svn://tug.org/texlive/trunk@14661 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf/scripts/texlive/updater-w3222
1 files changed, 15 insertions, 7 deletions
diff --git a/Master/texmf/scripts/texlive/updater-w32 b/Master/texmf/scripts/texlive/updater-w32
index 033df6feeff..2e5b242167a 100644
--- a/Master/texmf/scripts/texlive/updater-w32
+++ b/Master/texmf/scripts/texlive/updater-w32
@@ -125,7 +125,7 @@ if errorlevel 1 (
)
rem Set up perl environment
-set PERL5LIB=%tlroot%\tlpkg\tlperl\lib
+set "PERL5LIB=%tlroot%\tlpkg\tlperl\lib"
rem Get package list
set pkgpartslist=%w32upd_args%
@@ -199,20 +199,28 @@ call :debug "include into tlpdb: %~1%~2.tlpobj"
exit /b %errorlevel%
:info "message text"
-echo.%~1>>"%~dpn0.log"
-echo.%~1
+call :echomsg "%~1"
exit /b 0
:debug "message text"
-echo.%~1>>"%~dpn0.log"
-if /i %w32upd_debug%0 GTR 0 (>&2 echo D: %~1)
+if /i %w32upd_debug%0 GTR 0 (
+ call :echomsg "D: %~1" >&2
+) else (
+ call :echomsg "D: %~1" >nul
+)
exit /b 0
:error "message text"
-echo.%~1>>"%~dpn0.log"
->&2 echo.%~1
+call :echomsg "%~1" >&2
exit /b 1
+:echomsg "message text"
+set /p "=%~1" <nul >>"%~dpn0.log"
+echo.>>"%~dpn0.log"
+set /p "=%~1" <nul
+echo.
+exit /b 0
+
:updateinfo header pkgname oldrev newrev
set "infomsg= -> %~4"
:restoreinfo header pkgname oldrev newrev