aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-12-14 17:59:35 -0500
committerJack Nagel2014-12-14 17:59:35 -0500
commit9a89878b7556a4eb4bc7dafc855071b0ddaa5170 (patch)
tree710fb095eef7de26508a8a7b920726a678095bce /Library
parent5ca4dbfd25b61320da6ece04f815ab812031758c (diff)
downloadbrew-9a89878b7556a4eb4bc7dafc855071b0ddaa5170.tar.bz2
Revert "Skip temporary directory when target directory is known"
This reverts commit 028ee18b851497f8aede55004bcdcc5c16f087cc.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/resource.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index 218b75625..573a7bcb1 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -85,13 +85,13 @@ class Resource
# If block is given, yield to that block
# A target or a block must be given, but not both
def unpack(target=nil)
- if target
- mkdir_p(target)
- chdir(target) { downloader.stage }
- elsif block_given?
- mktemp(download_name) do
- downloader.stage
+ mktemp(download_name) do
+ downloader.stage
+ if block_given?
yield self
+ elsif target
+ target = Pathname.new(target) unless target.is_a? Pathname
+ target.install Dir['*']
end
end
end