more xzdec eradication

git-svn-id: svn://tug.org/texlive/trunk@47879 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 18 insertions, 24 deletions

diff --git a/Master/tlpkg/bin/check-tlnet-consistency b/Master/tlpkg/bin/check-tlnet-consistency
index b8f28b36b65..a48801d9002 100755
--- a/Master/tlpkg/bin/check-tlnet-consistency
+++ b/Master/tlpkg/bin/check-tlnet-consistency
@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
-# Copyright 2008-2016 Norbert Preining
+# $Id$
+# Copyright 2008-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -54,10 +55,6 @@ sub main {
   } else {
     # do a full setup
     my $ret = &TeXLive::TLUtils::setup_programs("$Master/tlpkg/installer");
-    if ($ret == -1) {
-      tlwarn("no binary of xzdec for $::_platform_ detected, aborting.\n");
-      exit 1;
-    }
     if (!$ret) {
       tlwarn("binaries could not be set up, aborting.\n");
       exit 1;
@@ -90,12 +87,12 @@ sub main {
     my $dodoc = ($tlpdb->config_doc_container && $tlpdbtlpobj->docfiles);
     my $dosrc = ($tlpdb->config_src_container && $tlpdbtlpobj->srcfiles);
     if ($opt_filelists) {
-      system("cat $cont | $::progs{xzdec} | $::progs{tar} -C \"$temp\" -xf - ");
+      system("cat $cont | $::progs{xz} | $::progs{tar} -C \"$temp\" -xf - ");
     } else {
-      system("cat $cont | $::progs{xzdec} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
+      system("cat $cont | $::progs{xz} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
     }
     if (! -r "$temp/tlpkg/tlpobj/$pkg.tlpobj") {
-      debug("ERROR: no tlpobj\n");
+      debug("ERROR: no tlpobj: $temp/tlpkg/tlpobj/$pkg.tlpobj\n");
       push @notlpobj, $pkg;
     } else {
       my $tartlpobj = TeXLive::TLPOBJ->new;
diff --git a/Master/tlpkg/bin/tl-fix-container-infos b/Master/tlpkg/bin/tl-fix-container-infos
index e09c9dac173..f46ab5e7a57 100755
--- a/Master/tlpkg/bin/tl-fix-container-infos
+++ b/Master/tlpkg/bin/tl-fix-container-infos
@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
-# Copyright 2008-2016 Norbert Preining
+# $Id$
+# Copyright 2008-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -74,10 +75,6 @@ sub main {
   } else {
     # do a full setup
     my $ret = &TeXLive::TLUtils::setup_programs("$Master/tlpkg/installer");
-    if ($ret == -1) {
-      tlwarn("$0: no xzdec for $::_platform_, aborting.\n");
-      exit 1;
-    }
     if (!$ret) {
       tlwarn("$0: binaries could not be set up, aborting.\n");
       exit 1;
diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet
index 38206cd98f3..21a7e527b4f 100755
--- a/Master/tlpkg/bin/tl-makeself-from-tlnet
+++ b/Master/tlpkg/bin/tl-makeself-from-tlnet
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 # $Id$
-# Copyright 2008-2017 Norbert Preining
+# Copyright 2008-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -55,11 +55,10 @@ if test -z "$infrarev"; then
   exit 1
 fi
 #
-# don't think quotes are needed here, except for possible sh bugs?
 for i in "$ARCHIVE"/$infrapkg*.tar.xz; do
   case "$i" in 
     *win32*) ;;
-    *) xzdec <"$i" | tar -xf - || exit 1;;
+    *) xz <"$i" | tar -xf - || exit 1;;
   esac
 done
 
@@ -127,6 +126,7 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb" && test -d "$ROOT/tlpkg/tlpobj/"; then
 
   t_instdir=$ROOT/tlpkg/installer  # target installer dir
   t_xzdir=$t_instdir/xz
+  t_lz4dir=$t_instdir/lz4
   t_wgetdir=$t_instdir/wget
   #
   # ensure these target directories exist.
@@ -153,9 +153,10 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb" && test -d "$ROOT/tlpkg/tlpobj/"; then
     # install the bin dir for this platform.
     (cd bin && tar cf - "$b") | (cd "$ROOT/bin" && tar xf -) || exit 1
 
-    # copy the installer binaries; not everything provides wget.
-    cp installer/xz/xzdec."$b" "$t_xzdir/" || exit 1
+    # copy the installer binaries; not everything provides wget or lz4.
     cp installer/xz/xz."$b" "$t_xzdir/" || exit 1
+    test -r installer/lz4/lz4.$b \
+      && { cp installer/lz4/lz4.$b "$t_lz4dir/" || exit 1; }
     test -r installer/wget/wget.$b \
       && { cp installer/wget/wget.$b "$t_wgetdir/" || exit 1; }
   done
@@ -163,6 +164,7 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb" && test -d "$ROOT/tlpkg/tlpobj/"; then
 else
   cat <<END_ABORT_NODIR >&2
 $0: Cannot find TeX Live root using kpsewhich --var-value=SELFAUTOPARENT.
+$0: (no tlpkg/texlive.tlpdb and/or tlpkg/tlpobj/.)
 $0: Please set your PATH as needed, otherwise it's hopeless.
 END_ABORT_NODIR
   exit 1
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 05b58e83e63..651b477a810 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# $Id$
 # Copyright 2008-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -229,10 +230,6 @@ sub main {
     # do a full setup
     my $ret
          = &TeXLive::TLUtils::setup_programs("$script_master/tlpkg/installer");
-    if ($ret == -1) {
-      tlwarn("$0: no xzdec for $::_platform_, aborting.\n");
-      exit 1;
-    }
     if (!$ret) {
       tlwarn("$0: binaries could not be set up, aborting.\n");
       exit 1;
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index f74c8a0bca6..945ce23bbd1 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -2,8 +2,9 @@ category TLCore
 shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get the TeX Live
 longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus
-longdesc (sometimes) tar and wget.  These files end up in the standalone
-longdesc install packages, and in the tlcritical repository.
+longdesc (sometimes) tar and wget.  These files also end up in the
+longdesc tlcritical recovery scripts.  The standalone installer is
+longdesc close, but not the same; it's defined in 00texlive.installer.
 
 docpattern f README
 docpattern f README*