admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Compare cellar and prefix against constants

Browse Source
This commit is contained in:
Jack Nagel 2014-07-12 22:43:35 -05:00
parent 58464287bc
commit 7b1ca1d152
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/bottle.rb
View File

@ -12,12 +12,12 @@ BOTTLE_ERB = <<-EOS
<% if root_url != BottleSpecification::DEFAULT_ROOT_URL %> <% if root_url != BottleSpecification::DEFAULT_ROOT_URL %>
root_url "<%= root_url %>" root_url "<%= root_url %>"
<% end %> <% end %>
<% if prefix.to_s != "/usr/local" %> <% if prefix != BottleSpecification::DEFAULT_PREFIX %>
prefix "<%= prefix %>" prefix "<%= prefix %>"
<% end %> <% end %>
<% if cellar.is_a? Symbol %> <% if cellar.is_a? Symbol %>
cellar :<%= cellar %> cellar :<%= cellar %>
<% elsif cellar.to_s != "/usr/local/Cellar" %> <% elsif cellar != BottleSpecification::DEFAULT_CELLAR %>
cellar "<%= cellar %>" cellar "<%= cellar %>"
<% end %> <% end %>
<% if revision > 0 %> <% if revision > 0 %>
@ -186,8 +186,8 @@ module Homebrew
bottle = BottleSpecification.new bottle = BottleSpecification.new
bottle.root_url(root_url) if root_url bottle.root_url(root_url) if root_url
bottle.prefix HOMEBREW_PREFIX bottle.prefix HOMEBREW_PREFIX.to_s
bottle.cellar relocatable ? :any : HOMEBREW_CELLAR bottle.cellar relocatable ? :any : HOMEBREW_CELLAR.to_s
bottle.revision bottle_revision bottle.revision bottle_revision
bottle.sha1 bottle_path.sha1 => bottle_tag bottle.sha1 bottle_path.sha1 => bottle_tag