summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLUtils.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-05-18 23:46:50 +0000
committerNorbert Preining <preining@logic.at>2018-05-18 23:46:50 +0000
commita5eb764bf2b6f48b060a238df33fe168b049df57 (patch)
treece7c78a81613389e26c9b840a6659393c9ec27de /Master/tlpkg/TeXLive/TLUtils.pm
parent9a4c4ce12a0a4eeb9f89d66e43f632b02b9f3ee6 (diff)
more work on lz4 compression, working build containers
git-svn-id: svn://tug.org/texlive/trunk@47759 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 476ebf5b5ef..4a5aebbb304 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2147,7 +2147,7 @@ sub unpack {
# wget is again checked by download file
# my $wget = $::progs{'wget'};
# only check the necessary compressor program
- my $decompressor = TeXLive::TLUtils::quotify_path_with_spaces($::progs{$CompressorProgram{$type}});
+ my $decompressor = TeXLive::TLUtils::quotify_path_with_spaces($::progs{$DecompressorProgram{$type}});
my $decompressorArgs = $::progs{$DecompressorArgs{$type}};
if (!defined($decompressor)) {
return (0, "programs not set up properly");
@@ -2156,6 +2156,7 @@ sub unpack {
my $fn = basename($what);
my $pkg = $fn;
+ # TODO use %CompressorExtensions here!!!
$pkg =~ s/\.tar\.$AcceptedCompressorsRegexp$//;
my $tarfile;
my $remove_containerfile = $remove;
@@ -2327,13 +2328,15 @@ sub setup_programs {
$::progs{'xzdec'} = "xzdec";
$::progs{'xz'} = "xz";
$::progs{'tar'} = "tar";
+ $::progs{'lz4'} = "lz4";
if ($^O =~ /^MSWin/i) {
- $::progs{'wget'} = conv_to_w32_path("$bindir/wget/wget.exe");
- $::progs{'tar'} = conv_to_w32_path("$bindir/tar.exe");
+ $::progs{'wget'} = conv_to_w32_path("$bindir/wget/wget.exe");
+ $::progs{'tar'} = conv_to_w32_path("$bindir/tar.exe");
$::progs{'xzdec'} = conv_to_w32_path("$bindir/xz/xzdec.exe");
$::progs{'xz'} = conv_to_w32_path("$bindir/xz/xz.exe");
- for my $prog ("xzdec", "wget") {
+ $::progs{'lz4'} = conv_to_w32_path("$bindir/lz4/lz4.exe");
+ for my $prog ("xzdec", "wget", "lz4") {
my $opt = $prog eq "xzdec" ? "--help" : "--version";
my $ret = system("$::progs{$prog} $opt >nul 2>&1"); # on windows
if ($ret != 0) {
@@ -2359,7 +2362,7 @@ sub setup_programs {
$s += setup_unix_one('xzdec',"$bindir/xz/xzdec.$platform","--help");
$s += setup_unix_one('xz', "$bindir/xz/xz.$platform", "notest");
$s += setup_unix_one('lz4', "$bindir/lz4/lz4.$platform", "--version");
- $ok = ($s == 3); # failure return unless all are present.
+ $ok = ($s == 4); # failure return unless all are present.
}
return $ok;