diff options
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index af9f260a557..ac661311c73 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -634,7 +634,6 @@ sub install_package { my $tar = "tar"; if (win32()) { $wget = conv_to_win_path("$bindir/wget.exe"); - $lzmadec = conv_to_win_path("$bindir/lzma.exe"); $tar = conv_to_win_path("$bindir/bsdtar.exe"); $target =~ s!/!\\!g; } @@ -658,16 +657,16 @@ sub install_package { $tarfile =~ s/\.lzma$//; mkdirhier("$target/temp"); tllog($::LOG_DEBUG, "Downloading $what to $target\\temp\\$fn\n"); - mysystem("$wget -q -O \"$target\\temp\\$fn\" \"$what\""); + tllog($::LOG_DEBUG, `$wget -q -O \"$target\\temp\\$fn\" \"$what\" 2>\&1`); tllog($::LOG_DEBUG, "Un-lzmaing $target\\temp\\$fn to $target\\temp\\$tarfile\n"); - mysystem("$lzmadec d \"$target\\temp\\$fn\" \"$target\\temp\\$tarfile\""); + tllog($::LOG_DEBUG, `type \"$target\\temp\\$fn\" | $lzmadec > \"$target\\temp\\$tarfile\" 2>&1`); tllog($::LOG_DEBUG, "Unpacking temp\\$tarfile\n"); - mysystem("pushd \"$target\" & $tar -xf \"temp\\$tarfile\""); + tllog($::LOG_DEBUG, `pushd \"$target\" & $tar -xf \"temp\\$tarfile\" 2>&1`); unlink("$target\\temp\\$tarfile"); unlink("$target\\temp\\$fn"); } else { tllog($::LOG_DEBUG, "downloading/unlzma-ing/unpacking $what\n"); - system "$wget -q -O- \"$what\"|\"$lzmadec\"|$tar -xf - -C \"$target\""; + tllog($::LOG_NORMAL, `$wget -q -O- \"$what\"|\"$lzmadec\"|$tar -xf - -C \"$target\"`); } } elsif ($what =~ m,\.tar.lzma$,) { if (win32()) { @@ -676,13 +675,13 @@ sub install_package { $tarfile =~ s/\.lzma$//; mkdirhier("$target/temp"); tllog($::LOG_DEBUG, "Un-lzmaing $what to $target\\temp\\$tarfile\n"); - mysystem("$lzma d \"$what\" \"$target\\temp\\$tarfile\""); + tllog($::LOG_DEBUG, `type \"$what\" | $lzmadec > \"$target\\temp\\$tarfile\" 2>&1`); tllog($::LOG_DEBUG, "Unpacking temp\\$tarfile\n"); - mysystem("pushd \"$target\" & $tar -xf \"temp\\$tarfile\""); + tllog($::LOG_DEBUG, `pushd \"$target\" & $tar -xf \"temp\\$tarfile\" 2>&1`); unlink("$target\\temp\\$tarfile"); } else { tllog($::LOG_DEBUG, "downloading/unlzma-ing/unpacking $what\n"); - system "cat \"$what\"|\"$lzmadec\"|$tar -xf - -C \"$target\""; + tllog($::LOG_DEBUG, `cat \"$what\"|\"$lzmadec\"|$tar -xf - -C \"$target\" 2>&1`); } } else { die "Don't know how to install $what!\n"; |