From db93a822b2c85f121a3c6520e47287513058693c Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 16 Dec 2014 20:47:39 -0500 Subject: salt: remove custom download strategy --- Library/Formula/saltstack.rb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'Library/Formula/saltstack.rb') diff --git a/Library/Formula/saltstack.rb b/Library/Formula/saltstack.rb index b5680d0c0..c218a4ae3 100644 --- a/Library/Formula/saltstack.rb +++ b/Library/Formula/saltstack.rb @@ -1,15 +1,5 @@ require "formula" -# We use a custom download strategy to properly configure -# salt's version information when built against HEAD. -# This is populated from git information unfortunately. -class SaltHeadDownloadStrategy < GitDownloadStrategy - def stage - cached_location.cd { reset } - quiet_safe_system "git", "clone", cached_location, "." - end -end - class Saltstack < Formula homepage "http://www.saltstack.org" url "https://github.com/saltstack/salt/archive/v2014.7.0.tar.gz" @@ -21,8 +11,7 @@ class Saltstack < Formula sha1 "a3776f39e5c18b660dcabf3127286eddfdfc445c" => :mountain_lion end - head "https://github.com/saltstack/salt.git", :branch => "develop", - :using => SaltHeadDownloadStrategy, :shallow => false + head "https://github.com/saltstack/salt.git", :branch => "develop", :shallow => false depends_on :python if MacOS.version <= :snow_leopard depends_on "swig" => :build @@ -91,6 +80,7 @@ class Saltstack < Formula end end + ln_s cached_download/".git", ".git" system "python", "setup.py", "install", "--prefix=#{prefix}" man1.install Dir["doc/man/*.1"] -- cgit v1.2.3