From cd5f61b188f3160d3d2020f418410ed72e58a566 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 23 May 2018 02:32:50 +0000 Subject: get rid of all traces of xzdec git-svn-id: svn://tug.org/texlive/trunk@47804 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 2 +- Master/texmf-dist/scripts/texlive/tlmgr.pl | 20 ++++++++++++-------- Master/tlpkg/TeXLive/TLPDB.pm | 2 +- Master/tlpkg/TeXLive/TLUtils.pm | 4 ++-- Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 4 ---- Master/tlpkg/tlpsrc/texlive.infra.tlpsrc | 9 --------- 6 files changed, 16 insertions(+), 25 deletions(-) diff --git a/Master/install-tl b/Master/install-tl index 3f6763f1a6b..1fbe07d9c39 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -483,7 +483,7 @@ if ($opt_location) { } } -# find wget, tar, xzdec +# find wget, tar, xz if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) { tldie("$0: Goodbye.\n"); } 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 switches TeX Live to auto detection mode for platform. -Platform detection is needed to select the proper C, C and +Platform detection is needed to select the proper C and C binaries that are shipped with TeX Live. C is a synonym for C. diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index d2cd1edefda..aeeae5577d3 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -339,7 +339,7 @@ sub from_file { if ($ret && (-r "$xzfile")) { # ok, let the fun begin debug("decompressing $xzfile to $tlpdbfile\n"); - # xzdec *hopefully* returns 0 on success and anything else on failure + # xz *hopefully* returns 0 on success and anything else on failure # we don't have to negate since not zero means error in the shell # and thus in perl true if (system("$decompressor @decompressorArgs <$xzfile_quote >$tlpdbfile_quote")) { diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index d2492f15b60..33d10629d28 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -2314,8 +2314,8 @@ sub read_file_ignore_cr { =item C Populate the global C<$::progs> hash containing the paths to the -programs C, C, C. The C<$bindir> argument specifies -the path to the location of the C binaries, the C<$platform> +programs C, C, C. The C<$bindir> argument specifies +the path to the location of the C binaries, the C<$platform> gives the TeX Live platform name, used as the extension on our executables. If a program is not present in the TeX Live tree, we also check along PATH (without the platform extension.) diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index ddc91a0fe3d..2bda192b5c7 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -26,13 +26,9 @@ runpattern !f tlpkg/installer/tar.exe binpattern d/win32 tlpkg/tlperl binpattern f/win32 tlpkg/installer/tar.exe binpattern f/win32 tlpkg/installer/wget/wget.exe -binpattern f/win32 tlpkg/installer/xz/xzdec.exe binpattern f/win32 install-tl-windows.bat binpattern f/win32 install-tl-advanced.bat # -# xzdec binaries for all (but no need for xz): -binpattern f tlpkg/installer/xz/xzdec.${ARCH} -# # platforms for which we do not provide wget, because it is part of the # normal system install (this list is duplicated in texlive.infra): binpattern f/!\ diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc index 2d343aa75fb..f74c8a0bca6 100644 --- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc +++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc @@ -35,22 +35,13 @@ binpattern f/win32 bin/win32/runscript.* binpattern f/win32 bin/win32/tlmgr-gui.exe binpattern f/win32 bin/win32/wrunscript.* binpattern f/win32 tlpkg/installer/tar.exe -binpattern f/win32 tlpkg/installer/xz/xzdec.exe binpattern f/win32 tlpkg/installer/xz/xz.exe binpattern f/win32 tlpkg/installer/wget/wget.exe binpattern f/win32 tlpkg/installer/lz4/lz4.exe # -# i386-cygwin with .exe, everything else without. -binpattern f/!i386-cygwin tlpkg/installer/xz/xzdec.${ARCH} -binpattern f/i386-cygwin tlpkg/installer/xz/xzdec.i386-cygwin.exe -# binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH} binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe # -# x86_64-cygwin with .exe, everything else without. -binpattern f/!x86_64-cygwin tlpkg/installer/xz/xzdec.${ARCH} -binpattern f/x86_64-cygwin tlpkg/installer/xz/xzdec.x86_64-cygwin.exe -# binpattern f/!x86_64-cygwin tlpkg/installer/xz/xz.${ARCH} binpattern f/x86_64-cygwin tlpkg/installer/xz/xz.x86_64-cygwin.exe # -- cgit v1.2.3