texlive[47887] Master/tlpkg: xz -d some more; dump ::progs at ddebug

[commits+karl at tug.org]

Revision: 47887
          http://tug.org/svn/texlive?view=revision&revision=47887
Author:   karl
Date:     2018-05-31 18:50:47 +0200 (Thu, 31 May 2018)
Log Message:
-----------
xz -d some more; dump ::progs at ddebug levels

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLConfig.pm
    trunk/Master/tlpkg/TeXLive/TLUtils.pm
    trunk/Master/tlpkg/bin/tl-makeself-from-tlnet
    trunk/Master/tlpkg/bin/tl-update-tlcritical

Modified: trunk/Master/tlpkg/TeXLive/TLConfig.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLConfig.pm	2018-05-31 06:23:07 UTC (rev 47886)
+++ trunk/Master/tlpkg/TeXLive/TLConfig.pm	2018-05-31 16:50:47 UTC (rev 47887)
@@ -119,11 +119,13 @@
 
 #
 our $DefaultFallbackDownloader = "wget";
-our @AcceptedFallbackDownloaders = qw/wget curl/;
+our @AcceptedFallbackDownloaders = qw/curl wget/;
 our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl');
 our %FallbackDownloaderArgs = (
-  'wget' => ['--user-agent=texlive/wget', '--tries=10', "--timeout=$NetworkTimeout", '-q', '-O'],
-  'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', '--connect-timeout', "$NetworkTimeout", '--silent', '--output']
+  'curl' => ['--user-agent', 'texlive/curl', '--retry', '10',
+             '--connect-timeout', "$NetworkTimeout", '--silent', '--output'],
+  'wget' => ['--user-agent=texlive/wget', '--tries=10',
+             "--timeout=$NetworkTimeout", '-q', '-O'],
 );
 # the way we package things on the web
 our $DefaultCompressorFormat = "xz";

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-05-31 06:23:07 UTC (rev 47886)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-05-31 16:50:47 UTC (rev 47887)
@@ -2318,7 +2318,7 @@
 =item C<setup_programs($bindir, $platform)>
 
 Populate the global C<$::progs> hash containing the paths to the
-programs C<wget>, C<tar>, C<xz>. The C<$bindir> argument specifies
+programs C<lz4>, C<tar>, C<wget>, 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
@@ -2411,7 +2411,7 @@
     $::progs{'compressor'} = $ENV{'TEXLIVE_COMPRESSOR'};
   }
 
-  if ($::opt_verbosity >= 1) {
+  if ($::opt_verbosity >= 2) {
     require Data::Dumper;
     use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys
                 $Data::Dumper::Purity); # -w pain
@@ -2418,6 +2418,7 @@
     $Data::Dumper::Indent = 1;
     $Data::Dumper::Sortkeys = 1;  # stable output
     $Data::Dumper::Purity = 1; # recursive structures must be safe
+    print STDERR "DD:dumping ";
     print STDERR Data::Dumper->Dump([\%::progs], [qw(::progs)]);
   }
   return $ok;
@@ -2447,7 +2448,7 @@
       system("$prog $arg");
     }
   } else {
-    debug("Default progrma $def not readable?\n");
+    debug("Default program $def not readable?\n");
   }
   return($ready) if ($ready);
   # still here, try plain name without any specification
@@ -2622,7 +2623,7 @@
     } else {
       $downdest = $dest;
     }
-    # massage ssh:// into the scp acceptable scp://
+    # massage ssh:// into the scp-acceptable scp://
     $relpath =~ s!^ssh://!scp://!;
     my $retval = system("scp", "-q", $relpath, $downdest);
     if ($retval != 0) {

Modified: trunk/Master/tlpkg/bin/tl-makeself-from-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-makeself-from-tlnet	2018-05-31 06:23:07 UTC (rev 47886)
+++ trunk/Master/tlpkg/bin/tl-makeself-from-tlnet	2018-05-31 16:50:47 UTC (rev 47887)
@@ -58,7 +58,8 @@
 for i in "$ARCHIVE"/$infrapkg*.tar.xz; do
   case "$i" in 
     *win32*) ;;
-    *) xzdec <"$i" | tar -xf - || exit 1;;
+    *) : "uncompressing $i" # for debugging
+       xz -d <"$i" | tar -xf - || exit 1;;
   esac
 done
 
@@ -119,6 +120,7 @@
   mv ./master/bin .
   mkdir ./installer
   mv ./master/tlpkg/installer/xz ./installer
+  mv ./master/tlpkg/installer/lz4 ./installer
   mv ./master/tlpkg/installer/wget ./installer
 
   # install the architecture-independent files.
@@ -130,7 +132,7 @@
   t_wgetdir=$t_instdir/wget
   #
   # ensure these target directories exist.
-  mkdir -p "$t_xzdir" "$t_wgetdir"
+  mkdir -p "$t_xzdir" "$t_lz4dir" "$t_wgetdir"
 
   # Start the list of tlpobjs we will install with the
   # platform-independent part of the infrastructure package.

Modified: trunk/Master/tlpkg/bin/tl-update-tlcritical
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlcritical	2018-05-31 06:23:07 UTC (rev 47886)
+++ trunk/Master/tlpkg/bin/tl-update-tlcritical	2018-05-31 16:50:47 UTC (rev 47887)
@@ -3,7 +3,7 @@
 # Public domain.  Originally written 2008, Karl Berry.
 # Update the tlcritical mini-repository on tug with the critical
 # packages.  Also listed in tl-update-containers, unfortunately.
-# Run from cron.tl once a month, or whenever specified.
+# Run from cron.tl.
 
 tlcrit=/home/ftp/texlive/tlcritical
 recreate=
@@ -83,7 +83,7 @@
   $moredis
 
 # update Unix disaster recovery.
-echo "$0: running tl-makeself-from-tlnet..."
+echo "$0: running tl-makeself-from-tlnet $tlcrit..."
 tl-makeself-from-tlnet $tlcrit
 do_updater sh