kylefang/CocoaPods
1
0
Fork 0
mirror of https://github.com/zhigang1992/CocoaPods.git synced 2026-01-12 17:12:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not flatten the zip files downloaded via http

Browse Source
This commit is contained in:
Arnaud Bellec
2013-02-05 10:39:23 +01:00
parent 0be241d8df
commit 4a4ed07a69
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/cocoapods/downloader/http.rb
View File

@@ -74,12 +74,14 @@ module Pod
raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
end
# If the archive only contained a folder, move its contents to the target (#727)
contents = target_path.children
contents.delete(full_filename)
entry = contents.first
if contents.count == 1 && entry.directory?
FileUtils.move(entry.children, target_path)
# If the archive is a tarball and it only contained a folder, move its contents to the target (#727)
if [:tgz, :tar, :tbz].include? type
contents = target_path.children
contents.delete(full_filename)
entry = contents.first
if contents.count == 1 && entry.directory?
FileUtils.move(entry.children, target_path)
end
end
end