diff options
| author | Karl Berry <karl@freefriends.org> | 2008-10-04 22:28:26 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-10-04 22:28:26 +0000 |
| commit | 27ba1b8d22c0132a0b0c5fba15fb37ea10205cd3 (patch) | |
| tree | cfc85418191cbb885f6c4049c85595168f72ab6f | |
| parent | 8de567bd92b5f0161de0687a5397fca6ca2e7b8e (diff) | |
w32 updater patch from Norbert.
git-svn-id: svn://tug.org/texlive/trunk@10853 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 51f45796fdf..5f83896e270 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -673,7 +673,7 @@ sub action_backup { return(\%ret); } -sub start_win32_updater { +sub open_win32_updater { my $root = shift; open UPDATER, ">" . $root . "/tlpkg/installer/updater.bat" or die "Cannot create updater.bat: $!"; @@ -712,6 +712,7 @@ tlpkg\\installer\\lzma\\lzmadec.win32.exe < temp\\$pkg.tar.lzma > temp\\$pkg.ta tlpkg\\installer\\tarsave.exe -x -f temp\\$pkg.tar call tlmgr _include_tlpobj tlpkg\\tlpobj\\$pkg.tlpobj del temp\\$pkg.tar.lzma +del temp\\$pkg.tar EOF ; } @@ -768,17 +769,21 @@ EOF # add lines to the un-archiver do_one ($pkg); } - if ($do_src && ! -r "$temp/$pkg.src.tar.lzma") { - tlwarn ("Couldn't get $pkg.src.tar.lzma, that is bad\n"); - } else { - # add lines to the un-archiver - do_one ("$pkg.src"); + if ($do_src) { + if (! -r "$temp/$pkg.src.tar.lzma") { + tlwarn ("Couldn't get $pkg.src.tar.lzma, that is bad\n"); + } else { + # add lines to the un-archiver + do_one ("$pkg.src"); + } } - if ($do_doc && ! -r "$temp/$pkg.doc.tar.lzma") { - tlwarn ("Couldn't get $pkg.doc.tar.lzma, that is bad\n"); - } else { - # add lines to the un-archiver - do_one ("$pkg.doc"); + if ($do_doc) { + if (! -r "$temp/$pkg.doc.tar.lzma") { + tlwarn ("Couldn't get $pkg.doc.tar.lzma, that is bad\n"); + } else { + # add lines to the un-archiver + do_one ("$pkg.doc"); + } } } } @@ -958,7 +963,7 @@ sub action_update { } } if (win32() && ($pkg =~ m/$WinSpecialUpdatePackagesRegexp/)) { - add_win32_updater($tlp, $opt_dry); + add_win32_updater($mediatlp, $opt_dry); } else { info("update: $pkg ($rev -> $mediarev) ... "); if ($opt_dry) { |