Permalink
Browse files

Merge remote-tracking branch 'tot-ra/patch-2'

Conflicts:
	src/Composer/Downloader/ArchiveDownloader.php
  • Loading branch information...
2 parents fe15c6a + 274b54c commit ebc0f8884f8fa04e649ce9a096bc73fc788438a8 @Seldaek Seldaek committed Aug 11, 2012
Showing with 14 additions and 9 deletions.
  1. +14 −9 src/Composer/Downloader/ArchiveDownloader.php
@@ -47,18 +47,23 @@ public function download(PackageInterface $package, $path)
if (1 === count($contentDir)) {
$contentDir = $contentDir[0];
- // Rename the content directory to avoid error when moving up
- // a child folder with the same name
- $temporaryName = md5(time().rand());
- $this->filesystem->rename($contentDir, $temporaryName);
- $contentDir = $temporaryName;
+ if (is_file($contentDir)) {
+ $this->filesystem->rename($contentDir, $path . '/' . basename($contentDir));
+ } else {
+ // Rename the content directory to avoid error when moving up
+ // a child folder with the same name
+ $temporaryName = md5(time().rand());
+ $this->filesystem->rename($contentDir, $temporaryName);
+ $contentDir = $temporaryName;
- foreach (array_merge(glob($contentDir . '/.*'), glob($contentDir . '/*')) as $file) {
- if (trim(basename($file), '.')) {
- $this->filesystem->rename($file, $path . '/' . basename($file));
+ foreach (array_merge(glob($contentDir . '/.*'), glob($contentDir . '/*')) as $file) {
+ if (trim(basename($file), '.')) {
+ $this->filesystem->rename($file, $path . '/' . basename($file));
+ }
}
+
+ rmdir($contentDir);
}
- rmdir($contentDir);
}
} catch (\Exception $e) {
// clean up

0 comments on commit ebc0f88

Please sign in to comment.