summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-05-31 06:17:31 +0000
committerNorbert Preining <preining@logic.at>2018-05-31 06:17:31 +0000
commitb652fb98441dd99f70d333725abd7b9a49287cfc (patch)
tree83a9f3757c69f2e45d2d4e8c2bc403537e678133
parent7287a67dbe9d3e2663726e4e93bd19c033d658cd (diff)
make sure xz is used with correct args, or systems xzdec
git-svn-id: svn://tug.org/texlive/trunk@47885 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/check-tlnet-consistency10
-rwxr-xr-xMaster/tlpkg/bin/tl-makeself-from-tlnet2
2 files changed, 6 insertions, 6 deletions
diff --git a/Master/tlpkg/bin/check-tlnet-consistency b/Master/tlpkg/bin/check-tlnet-consistency
index 56f8d086c06..402ff8edd65 100755
--- a/Master/tlpkg/bin/check-tlnet-consistency
+++ b/Master/tlpkg/bin/check-tlnet-consistency
@@ -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 @@ 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{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 @@ sub main {
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 @@ sub main {
}
}
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");
diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet
index 21a7e527b4f..f4d497403a6 100755
--- a/Master/tlpkg/bin/tl-makeself-from-tlnet
+++ b/Master/tlpkg/bin/tl-makeself-from-tlnet
@@ -58,7 +58,7 @@ fi
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