Fix @dl in custom strategies.

master
Adam Vandenberg 2010-02-02 22:27:21 -08:00
parent 134f6a2125
commit 4c498a56f9
2 changed files with 4 additions and 4 deletions

View File

@ -3,7 +3,7 @@ require 'formula'
class FreeimageHttpDownloadStrategy <CurlDownloadStrategy
def stage
# need to convert newlines or patch chokes
safe_system '/usr/bin/unzip', '-aqq', @dl
safe_system '/usr/bin/unzip', '-aqq', @tarball_path
chdir
end
end

View File

@ -4,11 +4,11 @@ class CurlXZDownloadStrategy < CurlDownloadStrategy
def stage
# As far as I can tell, the LZMA format does not have any magic header bits that we could use to
# identify LZMA archives in the CurlDownloadStrategy, so use this awesome hack
safe_system "lzma -k --force --stdout --decompress #{@dl} | /usr/bin/tar x"
safe_system "lzma -k --force --stdout --decompress #{@tarball_path} | /usr/bin/tar x"
# You could also do this, but it leaves the tar file lying around...
#safe_system '/usr/local/bin/lzma', '-k', '--force', '--decompress', @dl
#safe_system '/usr/bin/tar', 'xf', @dl.to_s.gsub( ".lzma", "" )
#safe_system '/usr/local/bin/lzma', '-k', '--force', '--decompress', @tarball_path
#safe_system '/usr/bin/tar', 'xf', @tarball_path.to_s.gsub( ".lzma", "" )
chdir
end
end