diff options
| author | Norbert Preining <preining@logic.at> | 2018-05-23 02:32:38 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2018-05-23 02:32:38 +0000 |
| commit | 1bc9a0565e5c03222bdeeb5a9aeaacdc90531d80 (patch) | |
| tree | e6ae3eab2c3cef5c2dbcc8c6c19b6fc21faf40e9 /Master/tlpkg/TeXLive/TLUtils.pm | |
| parent | cc2f0463e08cdfb7e55b1b57b1c9b55c7af010b3 (diff) | |
get rid of xzdec requirement, use only xz
git-svn-id: svn://tug.org/texlive/trunk@47803 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 76c73abcb8b..d2492f15b60 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -2329,7 +2329,6 @@ sub setup_programs { my $ok = 1; $::progs{'wget'} = "wget"; - $::progs{'xzdec'} = "xzdec"; $::progs{'xz'} = "xz"; $::progs{'tar'} = "tar"; $::progs{'lz4'} = "lz4"; @@ -2337,15 +2336,13 @@ sub setup_programs { if ($^O =~ /^MSWin/i) { $::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"); $::progs{'lz4'} = conv_to_w32_path("$bindir/lz4/lz4.exe"); - for my $prog ("xzdec", "wget") { - my $opt = $prog eq "xzdec" ? "--help" : "--version"; - my $ret = system("$::progs{$prog} $opt >nul 2>&1"); # on windows + for my $prog ("xz", "wget") { + my $ret = system("$::progs{$prog} --version >nul 2>&1"); # on windows if ($ret != 0) { warn "TeXLive::TLUtils::setup_programs (w32) failed"; # no nl for perl - warn "$::progs{$prog} $opt failed (status $ret): $!\n"; + warn "$::progs{$prog} --version failed (status $ret): $!\n"; warn "Output is:\n"; system ("$::progs{$prog} $opt"); warn "\n"; @@ -2363,9 +2360,8 @@ sub setup_programs { } my $s = 0; $s += setup_unix_one('wget', "$bindir/wget/wget.$platform", "--version"); - $s += setup_unix_one('xzdec',"$bindir/xz/xzdec.$platform","--help"); $s += setup_unix_one('xz', "$bindir/xz/xz.$platform", "notest"); - $ok = ($s == 3); # failure return unless all are present. + $ok = ($s == 2); # failure return unless all are present. # also try to set up lz4, but don't fail/warn setup_unix_one('lz4', "$bindir/lz4/lz4.$platform", "--version", 1); } |