From 5ca4dbfd25b61320da6ece04f815ab812031758c Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 14 Dec 2014 13:32:50 -0500 Subject: Skip temporary directory when target directory is known --- Library/Homebrew/resource.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb index 573a7bcb1..218b75625 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) - mktemp(download_name) do - downloader.stage - if block_given? + if target + mkdir_p(target) + chdir(target) { downloader.stage } + elsif block_given? + mktemp(download_name) do + downloader.stage yield self - elsif target - target = Pathname.new(target) unless target.is_a? Pathname - target.install Dir['*'] end end end -- cgit v1.2.3