From 7513a478ad7c3be09af3d51dd6ade218547a2c6a Mon Sep 17 00:00:00 2001 From: Piotr Strzelczyk Date: Thu, 7 May 2009 22:46:04 +0000 Subject: switch installer to tlperl git-svn-id: svn://tug.org/texlive/branches/branch2009-dev@12997 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl.bat | 11 ++++------- Master/tl-portable.bat | 9 ++++----- Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 5 ++--- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Master/install-tl.bat b/Master/install-tl.bat index 5c19345af14..8b0dbc3f75d 100755 --- a/Master/install-tl.bat +++ b/Master/install-tl.bat @@ -8,16 +8,14 @@ set tldrive=%~d0 %tldrive% cd %tlroot% -rem we need wget in the path, so add tlpkg\bin to the path -path %tlroot%tlpkg\installer;%path% - rem use provided Perl -set PERL5LIB=%tlroot%tlpkg\installer\perllib +set PERL5LIB=%tlroot%tlpkg\tlperl\lib +path %tlroot%tlpkg\tlperl\bin;%path% rem remove TeX directories from searchpath with rem some embedded Perl and a temporary batchfile. rem If it is done in the Perl installer then it may not work right. -"%tlroot%tlpkg\installer\perl" -x "%~dpn0.bat" +perl -x "%~dpn0.bat" goto fixpath #! perl @@ -37,10 +35,9 @@ __END__ :fixpath call %TEMP%\setpath.bat -path %tlroot%tlpkg\installer;%path% echo Path: %path% rem del %TEMP%\setpath.bat -"%tlroot%tlpkg\installer\perl" "%~dpn0" %* +perl "%~dpn0" %* pause Done rem endlocal is implicit diff --git a/Master/tl-portable.bat b/Master/tl-portable.bat index 5ec2bfceaa9..3fcf68d8a70 100755 --- a/Master/tl-portable.bat +++ b/Master/tl-portable.bat @@ -37,14 +37,13 @@ set TEXBINDIR=%TEXDIR%bin\win32 set platform=win32 rem use provided Perl - -set PERL5LIB=%TEXDIR%tlpkg\installer\perllib -path %TEXDIR%tlpkg\installer;%path% -"%TEXDIR%tlpkg\installer\perl" "%TEXDIR%install-tl" --portable +set PERL5LIB=%TEXDIR%tlpkg\tlperl\lib +path %TEXDIR%tlpkg\tlperl\bin;%path% +perl "%TEXDIR%install-tl" --portable if not errorlevel 1 goto doit echo Initialization of TeXLive failed! pause -exit +exit /b 1 :doit path %TEXDIR%bin\win32;%path% diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index 81eeb72f62a..d64b3c4bec4 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -28,9 +28,8 @@ runpattern !f tlpkg/installer/*.exe runpattern !f tlpkg/installer/*.dll # # binpatterns -binpattern d/win32 tlpkg/installer/perllib -binpattern f/win32 tlpkg/installer/*.exe -binpattern f/win32 tlpkg/installer/*.dll +binpattern d/win32 tlpkg/tlperl +binpattern f/win32 tlpkg/installer/tar.exe binpattern f/win32 install-tl.bat # shouldn't be in the installer packages # binpattern f/win32 tl-portable.bat -- cgit v1.2.3