texlive[47804] Master: get rid of all traces of xzdec

commits+preining at tug.org commits+preining at tug.org
Wed May 23 04:32:51 CEST 2018


Revision: 47804
          http://tug.org/svn/texlive?view=revision&revision=47804
Author:   preining
Date:     2018-05-23 04:32:50 +0200 (Wed, 23 May 2018)
Log Message:
-----------
get rid of all traces of xzdec

Modified Paths:
--------------
    trunk/Master/install-tl
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
    trunk/Master/tlpkg/TeXLive/TLPDB.pm
    trunk/Master/tlpkg/TeXLive/TLUtils.pm
    trunk/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
    trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2018-05-23 02:32:38 UTC (rev 47803)
+++ trunk/Master/install-tl	2018-05-23 02:32:50 UTC (rev 47804)
@@ -483,7 +483,7 @@
   }
 }
 
-# find wget, tar, xzdec
+# find wget, tar, xz
 if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) {
   tldie("$0: Goodbye.\n");
 }

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2018-05-23 02:32:38 UTC (rev 47803)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2018-05-23 02:32:50 UTC (rev 47804)
@@ -2269,24 +2269,28 @@
       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 @@
 
 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>.

Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm	2018-05-23 02:32:38 UTC (rev 47803)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm	2018-05-23 02:32:50 UTC (rev 47804)
@@ -339,7 +339,7 @@
       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")) {

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-05-23 02:32:38 UTC (rev 47803)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-05-23 02:32:50 UTC (rev 47804)
@@ -2314,8 +2314,8 @@
 =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.)

Modified: trunk/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc	2018-05-23 02:32:38 UTC (rev 47803)
+++ trunk/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc	2018-05-23 02:32:50 UTC (rev 47804)
@@ -26,13 +26,9 @@
 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/!\

Modified: trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc	2018-05-23 02:32:38 UTC (rev 47803)
+++ trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc	2018-05-23 02:32:50 UTC (rev 47804)
@@ -35,22 +35,13 @@
 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
 #



More information about the tex-live-commits mailing list