diff options
author | Siep Kroonenberg <siepo@cybercomm.nl> | 2008-11-02 21:30:49 +0000 |
---|---|---|
committer | Siep Kroonenberg <siepo@cybercomm.nl> | 2008-11-02 21:30:49 +0000 |
commit | 9683e2f7185c5cf8b4a194d839e26425a5b9e811 (patch) | |
tree | 525feebadb07ef1014d83a886756a07baf89b17c /Master | |
parent | 1376cc9defb4d5ca60c2c4bbd5aacd6fd4f10f67 (diff) |
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
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/install-tl | 20 | ||||
-rwxr-xr-x | Master/install-tl.bat | 29 |
2 files changed, 37 insertions, 12 deletions
diff --git a/Master/install-tl b/Master/install-tl index 938a7fbdead..d32b691efdf 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1042,15 +1042,17 @@ operations might be disturbed.\n\n"; my $perl_bindir="$TEXDIR/tlpkg/tlperl/bin"; my $perl_libdir="$TEXDIR/tlpkg/tlperl/lib"; - if (win32) { - debug("Removing other TeXs from path\n"); - my @newpt = (); - foreach my $d (split (';', $ENV{'PATH'})) { - push @newpt, $d unless TeXLive::TLWinGoo::is_a_texdir($d); - } - $ENV{'PATH'} = join($pathsep, @newpt); - debug("Path after removals(s):\n $ENV{'PATH'}\n"); - } +## This won't do any good; +## have to remove other tex directories in calling batchfile +# if (win32) { +# debug("Removing other TeXs from path\n"); +# my @newpt = (); +# foreach my $d (split (';', $ENV{'PATH'})) { +# push @newpt, $d unless TeXLive::TLWinGoo::is_a_texdir($d); +# } +# $ENV{'PATH'} = join($pathsep, @newpt); +# debug("Path after removals(s):\n $ENV{'PATH'}\n"); +# } debug("Prepending $plat_bindir to PATH\n"); 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
|