summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-05-23 02:32:50 +0000
committerNorbert Preining <preining@logic.at>2018-05-23 02:32:50 +0000
commitcd5f61b188f3160d3d2020f418410ed72e58a566 (patch)
treed2265ab88fbacdca379b6509c27bddc2298ce3db /Master/texmf-dist
parent1bc9a0565e5c03222bdeeb5a9aeaacdc90531d80 (diff)
get rid of all traces of xzdec
git-svn-id: svn://tug.org/texlive/trunk@47804 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl20
1 files changed, 12 insertions, 8 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 6b927fd2e70..e89a3ab30d9 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -2269,24 +2269,28 @@ sub write_w32_updater {
tlwarn("$prg: Creation of backup container of $pkg failed.\n");
return 1; # backup failed? abort
}
+ my $decompressor = $::progs{$DecompressorProgram{$DefaultCompressorFormat}};
+ my $compressorextension = $CompressorExtension{$DefaultCompressorFormat};
+ my @decompressorArgs = @{$DecompressorArgs{$DefaultCompressorFormat}};
foreach my $pkg_part (@pkg_parts) {
if ($media eq 'local_compressed') {
- copy("$repo/$pkg_part.tar.xz", "$temp");
+ copy("$repo/$pkg_part.tar.$compressorextension", "$temp");
} else { # net
- TeXLive::TLUtils::download_file("$repo/$pkg_part.tar.xz", "$temp/$pkg_part.tar.xz");
+ TeXLive::TLUtils::download_file("$repo/$pkg_part.tar.$compressorextension",
+ "$temp/$pkg_part.tar.$compressorextension");
}
# now we should have the file present
- if (!-r "$temp/$pkg_part.tar.xz") {
- tlwarn("$prg: Couldn't get $pkg_part.tar.xz, that is bad\n");
+ if (!-r "$temp/$pkg_part.tar.$compressorextension") {
+ tlwarn("$prg: Couldn't get $pkg_part.tar.$compressorextension, that is bad\n");
return 1; # abort
}
# unpack xz archive
- my $sysret = system("$::progs{'xzdec'} < \"$temp/$pkg_part.tar.xz\" > \"$temp/$pkg_part.tar\"");
+ my $sysret = system("$decompressor @decompressorArgs < \"$temp/$pkg_part.tar.xz\" > \"$temp/$pkg_part.tar\"");
if ($sysret) {
- tlwarn("$prg: Couldn't unpack $pkg_part.tar.xz\n");
+ tlwarn("$prg: Couldn't unpack $pkg_part.tar.$compressorextension\n");
return 1; # unpack failed? abort
}
- unlink("$temp/$pkg_part.tar.xz"); # we don't need that archive anymore
+ unlink("$temp/$pkg_part.tar.$compressorextension"); # we don't need that archive anymore
}
}
@@ -8313,7 +8317,7 @@ platform instead of auto detection.
C<platform set auto> switches TeX Live to auto detection mode for platform.
-Platform detection is needed to select the proper C<xz>, C<xzdec> and
+Platform detection is needed to select the proper C<xz> and
C<wget> binaries that are shipped with TeX Live.
C<arch> is a synonym for C<platform>.