public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #5569 from nicolas-grekas/clean-proc-output 

Cleanup processes output handling
pull/5645/head
Jordi Boggiano 2016-09-02 18:52:16 +02:00 committed by GitHub
parent 054f5305b7 f063d28a59
commit 4861b74d3d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Downloader/RarDownloader.php
View File

@ -44,7 +44,7 @@ class RarDownloader extends ArchiveDownloader
// Try to use unrar on *nix // Try to use unrar on *nix
if (!Platform::isWindows()) { if (!Platform::isWindows()) {
$command = 'unrar x ' . ProcessExecutor::escape($file) . ' ' . ProcessExecutor::escape($path) . ' && chmod -R u+w ' . ProcessExecutor::escape($path); $command = 'unrar x ' . ProcessExecutor::escape($file) . ' ' . ProcessExecutor::escape($path) . ' >/dev/null && chmod -R u+w ' . ProcessExecutor::escape($path);
if (0 === $this->process->execute($command, $ignoredOutput)) { if (0 === $this->process->execute($command, $ignoredOutput)) {
return; return;

2
src/Composer/Downloader/ZipDownloader.php
View File

@ -70,7 +70,7 @@ class ZipDownloader extends ArchiveDownloader
$processError = null; $processError = null;
if (self::$hasSystemUnzip && !(class_exists('ZipArchive') && Platform::isWindows())) { if (self::$hasSystemUnzip && !(class_exists('ZipArchive') && Platform::isWindows())) {
$command = 'unzip '.ProcessExecutor::escape($file).' -d '.ProcessExecutor::escape($path); $command = 'unzip -qq '.ProcessExecutor::escape($file).' -d '.ProcessExecutor::escape($path);
if (!Platform::isWindows()) { if (!Platform::isWindows()) {
$command .= ' && chmod -R u+w ' . ProcessExecutor::escape($path); $command .= ' && chmod -R u+w ' . ProcessExecutor::escape($path);
} }