texlive[47899] Master/tlpkg/bin/tl-makeself-from-tlnet: do not copy

[commits+karl at tug.org]

Revision: 47899
          http://tug.org/svn/texlive?view=revision&revision=47899
Author:   karl
Date:     2018-06-02 01:31:37 +0200 (Sat, 02 Jun 2018)
Log Message:
-----------
do not copy all lz4 binaries.

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/tl-makeself-from-tlnet

Modified: trunk/Master/tlpkg/bin/tl-makeself-from-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-makeself-from-tlnet	2018-06-01 21:42:34 UTC (rev 47898)
+++ trunk/Master/tlpkg/bin/tl-makeself-from-tlnet	2018-06-01 23:31:37 UTC (rev 47899)
@@ -116,12 +116,13 @@
     echo "$0: proceeding with tlmgr update."
   fi
 
-  # move the architecture-specific files to the top level.
+  # move the architecture-specific files away so we don't blindly copy
+  # them all. The loop below and tlmgr invocation at the end will update.
   mv ./master/bin .
   mkdir ./installer
   mv ./master/tlpkg/installer/xz ./installer
-  mv ./master/tlpkg/installer/lz4 ./installer
   mv ./master/tlpkg/installer/wget ./installer
+  mv ./master/tlpkg/installer/lz4 ./installer # could be anywhere
 
   # install the architecture-independent files.
   (cd master && tar cf - *) | (cd "$ROOT" && tar xf -) || exit 1
@@ -128,11 +129,10 @@
 
   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.
-  mkdir -p "$t_xzdir" "$t_lz4dir" "$t_wgetdir"
+  mkdir -p "$t_xzdir" "$t_wgetdir"
 
   # Start the list of tlpobjs we will install with the
   # platform-independent part of the infrastructure package.
@@ -155,10 +155,8 @@
     # 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 or lz4.
+    # copy the installer binaries; not everything provides wget.
     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