Move most of the stuff from tlpkg, tlmgr from branch to trunk

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

1 files changed, 9 insertions, 11 deletions

diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet
index 450d22230ed..2ead523a0fc 100755
--- a/Master/tlpkg/bin/tl-makeself-from-tlnet
+++ b/Master/tlpkg/bin/tl-makeself-from-tlnet
@@ -4,7 +4,7 @@
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
-# Creates a .run file for updating the texlive.infra and bin-texlive
+# Creates a .run file for updating the texlive.infra 
 # packages on Unix, similar to the .exe we create for Windows.  Both are
 # created in the nightly cron from tl-update-tlcritical.
 
@@ -28,13 +28,12 @@ cd $TMP
 mkdir master
 cd master
 
-# unpack texlive.infra and bin-texlive archives for all platforms,
-# except w32.
-for pkg in texlive.infra bin-texlive; do
-  for i in $ARCHIVE/$pkg*.tar.lzma ; do
+# unpack texlive.infra archives for all platforms, except w32.
+for pkg in texlive.infra; do
+  for i in $ARCHIVE/$pkg*.tar.xz ; do
     case "$i" in 
       *win32*) ;;
-      *) lzmadec <$i | tar -xf - ;;
+      *) xzdec <$i | tar -xf - ;;
     esac
   done
 done
@@ -68,25 +67,24 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb"; then
   t_instdir=$ROOT/tlpkg/installer  # target installer dir
   
   # ensure these target directories exist.
-  mkdir -p $t_instdir/lzma
+  mkdir -p $t_instdir/xz
   mkdir -p $t_instdir/wget
 
   # start the list of tlpobjs we will install
-  tlpobjs="$t_objdir/bin-texlive.tlpobj $t_objdir/texlive.infra.tlpobj"
+  tlpobjs="$t_objdir/texlive.infra.tlpobj"
   for a in $ROOT/bin/*; do
     test -d "$a" || continue  # skip any cruft files
     b=`basename $a`           # just the architecture name
     
     # add the tlpobjs for this platform t the list.
-    tlpobjs="$tlpobjs $t_objdir/bin-texlive.$b.tlpobj"
     tlpobjs="$tlpobjs $t_objdir/texlive.infra.$b.tlpobj"
 
     # install the bin dir for this platform.
     (cd bin && tar cf - $b) | (cd $ROOT/bin && tar xf -)
     
     # copy the installer binaries.
-    cp installer/lzma/lzmadec.$b $t_instdir/lzma/
-    cp installer/lzma/lzma.$b $t_instdir/lzma/
+    cp installer/xz/xzdec.$b $t_instdir/xz/
+    cp installer/xz/xz.$b $t_instdir/xz/
     test -r installer/wget/wget.$b \
     && cp installer/wget/wget.$b $t_instdir/wget
   done