aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/formula.rb
diff options
context:
space:
mode:
authorJack Nagel2014-03-10 14:56:01 -0500
committerJack Nagel2014-03-10 14:56:01 -0500
commit42e60f7c59d3c479670d357f7a10356e0b195410 (patch)
tree541f972b54178e20a4e3306a78ac9e25f5e62f33 /Library/Homebrew/formula.rb
parent15ad296cfdd831d496c3f5486be47d5a2c38a927 (diff)
downloadbrew-42e60f7c59d3c479670d357f7a10356e0b195410.tar.bz2
Make build_bottle an explicit installer mode
Diffstat (limited to 'Library/Homebrew/formula.rb')
-rw-r--r--Library/Homebrew/formula.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index e6e46ecb5..57c8a2edf 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -80,11 +80,15 @@ class Formula
end
end
+ def select_bottle?
+ !ARGV.build_bottle? && install_bottle?(self)
+ end
+
def determine_active_spec
case
when head && ARGV.build_head? then head # --HEAD
when devel && ARGV.build_devel? then devel # --devel
- when bottle && install_bottle?(self) then bottle # bottle available
+ when bottle && select_bottle? then bottle # bottle available
when stable then stable
when devel && stable.nil? then devel # devel-only
when head && stable.nil? then head # head-only