From 9683e2f7185c5cf8b4a194d839e26425a5b9e811 Mon Sep 17 00:00:00 2001 From: Siep Kroonenberg Date: Sun, 2 Nov 2008 21:30:49 +0000 Subject: Win32: path cleaned up in install-tl.bat, with embedded Perl code git-svn-id: svn://tug.org/texlive/trunk@11158 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl.bat | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'Master/install-tl.bat') diff --git a/Master/install-tl.bat b/Master/install-tl.bat index d3ade37b586..108cc3e718d 100755 --- a/Master/install-tl.bat +++ b/Master/install-tl.bat @@ -11,11 +11,34 @@ cd %tlroot% rem we need wget in the path, so add tlpkg\bin to the path path %tlroot%tlpkg\installer;%path% -rem We shouldn't have to add TL to the searchpath here, but we do -path %tlroot%bin\win32;%path% - rem use provided Perl set PERL5LIB=%tlroot%tlpkg\installer\perllib + +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" +goto fixpath + +#! perl +my @newpt = (); +foreach my $d (split (';', $ENV{'PATH'})) { + my $df = $d; + $df =~ s/\\/\//g; + push @newpt, $d unless (-e ($df."/pdftex.exe")); +} +$ENV{'PATH'} = join(';',@newpt); +my $batfile = $ENV{'TEMP'}."\\setpath.bat"; +$batfile =~ s/\\/\//g; +open TMPBAT, ">$batfile"; +print TMPBAT 'path '.$ENV{'PATH'}."\n"; +close TMPBAT; +__END__ + +:fixpath +call %TEMP%\setpath.bat +echo Path: %path% +rem del %TEMP%\setpath.bat "%tlroot%tlpkg\installer\perl" "%~dpn0" %* pause Done -- cgit v1.2.3