diff options
Diffstat (limited to 'Master/tlpkg')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 2 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 4 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 4 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/texlive.infra.tlpsrc | 9 |
4 files changed, 3 insertions, 16 deletions
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<setup_programs($bindir, $platform)> Populate the global C<$::progs> hash containing the paths to the -programs C<wget>, C<tar>, C<xzdec>. The C<$bindir> argument specifies -the path to the location of the C<xzdec> binaries, the C<$platform> +programs C<wget>, C<tar>, C<xz>. The C<$bindir> argument specifies +the path to the location of the C<xz> 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 # |