From ba56ac362a8ee0a953c8340410723568a4a282b6 Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Wed, 26 Feb 2014 23:49:53 +1100 Subject: [PATCH] Final fix. Preserve initial file name --- src/Composer/Downloader/GzipDownloader.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Composer/Downloader/GzipDownloader.php b/src/Composer/Downloader/GzipDownloader.php index e14b7de02..11e1b8ba6 100644 --- a/src/Composer/Downloader/GzipDownloader.php +++ b/src/Composer/Downloader/GzipDownloader.php @@ -15,6 +15,7 @@ namespace Composer\Downloader; use Composer\Config; use Composer\Cache; use Composer\EventDispatcher\EventDispatcher; +use Composer\Package\PackageInterface; use Composer\Util\ProcessExecutor; use Composer\IO\IOInterface; @@ -39,15 +40,24 @@ class GzipDownloader extends ArchiveDownloader // Try to use gunzip on *nix if (!defined('PHP_WINDOWS_VERSION_BUILD')) { - $targetDirectory = $path . '/' . basename($file); - $command = 'gzip -d < ' . escapeshellarg($file) . ' > ' . escapeshellarg($targetDirectory); + $targetFile = $path . '/' . basename(substr($file, 0, -3)); + $command = 'gzip -cd ' . escapeshellarg($file) . ' > ' . escapeshellarg($targetFile); if (0 === $this->process->execute($command, $ignoredOutput)) { return; } $processError = 'Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput(); + throw new \RuntimeException($processError); } } + + /** + * {@inheritdoc} + */ + protected function getFileName(PackageInterface $package, $path) + { + return $path.'/'.pathinfo(parse_url($package->getDistUrl(), PHP_URL_PATH), PATHINFO_BASENAME); + } }