texlive[47885] Master/tlpkg/bin: make sure xz is used with correct
commits+preining at tug.org
commits+preining at tug.org
Thu May 31 08:17:31 CEST 2018
Revision: 47885
http://tug.org/svn/texlive?view=revision&revision=47885
Author: preining
Date: 2018-05-31 08:17:31 +0200 (Thu, 31 May 2018)
Log Message:
-----------
make sure xz is used with correct args, or systems xzdec
Modified Paths:
--------------
trunk/Master/tlpkg/bin/check-tlnet-consistency
trunk/Master/tlpkg/bin/tl-makeself-from-tlnet
Modified: trunk/Master/tlpkg/bin/check-tlnet-consistency
===================================================================
--- trunk/Master/tlpkg/bin/check-tlnet-consistency 2018-05-31 02:18:39 UTC (rev 47884)
+++ trunk/Master/tlpkg/bin/check-tlnet-consistency 2018-05-31 06:17:31 UTC (rev 47885)
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+!/usr/bin/env perl
# $Id$
# Copyright 2008-2018 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -87,9 +87,9 @@
my $dodoc = ($tlpdb->config_doc_container && $tlpdbtlpobj->docfiles);
my $dosrc = ($tlpdb->config_src_container && $tlpdbtlpobj->srcfiles);
if ($opt_filelists) {
- system("cat $cont | $::progs{xz} | $::progs{tar} -C \"$temp\" -xf - ");
+ system("cat $cont | $::progs{xz} -dcf | $::progs{tar} -C \"$temp\" -xf - ");
} else {
- system("cat $cont | $::progs{xz} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
+ system("cat $cont | $::progs{xz} -dcf | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
}
if (! -r "$temp/tlpkg/tlpobj/$pkg.tlpobj") {
debug("ERROR: no tlpobj: $temp/tlpkg/tlpobj/$pkg.tlpobj\n");
@@ -100,7 +100,7 @@
die "Cannot load tlpobj from $temp/$pkg.tlpobj: $!" unless defined($tartlpobj);
# get the src and doc containers unpacked and add the respective files
if ($dosrc) {
- system("cat $srccont | $::progs{xz} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
+ system("cat $srccont | $::progs{xz} -dcf | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
if (! -r "$temp/tlpkg/tlpobj/$pkg.source.tlpobj") {
push @missingsrccontainer, $pkg;
debug("ERROR: missing src container\n");
@@ -112,7 +112,7 @@
}
}
if ($dodoc) {
- system("cat $doccont | $::progs{xz} | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
+ system("cat $doccont | $::progs{xz} -dcf | $::progs{tar} -C \"$temp\" -xf - tlpkg/tlpobj");
if (! -r "$temp/tlpkg/tlpobj/$pkg.doc.tlpobj") {
push @missingdoccontainer, $pkg;
debug("ERROR: missing doc container\n");
Modified: trunk/Master/tlpkg/bin/tl-makeself-from-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-makeself-from-tlnet 2018-05-31 02:18:39 UTC (rev 47884)
+++ trunk/Master/tlpkg/bin/tl-makeself-from-tlnet 2018-05-31 06:17:31 UTC (rev 47885)
@@ -58,7 +58,7 @@
for i in "$ARCHIVE"/$infrapkg*.tar.xz; do
case "$i" in
*win32*) ;;
- *) xz <"$i" | tar -xf - || exit 1;;
+ *) xzdec <"$i" | tar -xf - || exit 1;;
esac
done
More information about the tex-live-commits
mailing list