From 9a89878b7556a4eb4bc7dafc855071b0ddaa5170 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 14 Dec 2014 17:59:35 -0500 Subject: [PATCH] Revert "Skip temporary directory when target directory is known" This reverts commit 028ee18b851497f8aede55004bcdcc5c16f087cc. --- Library/Homebrew/resource.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb index 218b756254..573a7bcb1f 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