From 11415f66fa3172ddcec39693cc063ff7f15a00b6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 Aug 2008 23:28:20 +0000 Subject: (setup_programs): use warn instead of tlwarn so we can get program location in the output. git-svn-id: svn://tug.org/texlive/trunk@10076 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index d679f9ec3d3..afb3b99e4cd 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1033,16 +1033,15 @@ sub setup_programs { # check that the programs are actually working my $nul = "/dev/null"; $nul = "nul" if ($^O =~ /^MSWin(32|64)$/i); - # do not test tar for the moment, you never know what tar is there around - # for my $prog ("lzmadec", "tar", "wget") { + # do not test tar, we rely on the system having a usable one. + # The main point is to check the binaries we provide. for my $prog ("lzmadec", "wget") { my $opt = $prog eq "lzmadec" ? "--help" : "--version"; - # next if (($prog eq "tar") && ($platform eq "i386-openbsd")); my $ret = system("$::progs{$prog} $opt >$nul 2>$nul"); if ($ret != 0) { - tlwarn ("TeXLive::TLUtils::setup_programs failed:\n"); - tlwarn ("$::progs{$prog} $opt failed (status $ret): $!\n"); - tlwarn ("Output is:"); + warn "TeXLive::TLUtils::setup_programs failed"; # no newline + warn "$::progs{$prog} $opt failed (status $ret): $!\n"; + warn "Output is:\n"; system ("$::progs{$prog} $opt"); return 0; } -- cgit v1.2.3