diff options
| author | Jack Nagel | 2014-07-12 22:43:35 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-12 22:43:35 -0500 |
| commit | 7b1ca1d152b732fad3fa74651da8c4baff273b15 (patch) | |
| tree | a14ceeb8ad92d4bb6a63d2fa2dc38ab00aef7959 | |
| parent | 58464287bc35282a5001a1f9a3f69cecc7c552c7 (diff) | |
| download | brew-7b1ca1d152b732fad3fa74651da8c4baff273b15.tar.bz2 | |
Compare cellar and prefix against constants
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 316e5b43f..ee965fba2 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -12,12 +12,12 @@ BOTTLE_ERB = <<-EOS <% if root_url != BottleSpecification::DEFAULT_ROOT_URL %> root_url "<%= root_url %>" <% end %> - <% if prefix.to_s != "/usr/local" %> + <% if prefix != BottleSpecification::DEFAULT_PREFIX %> prefix "<%= prefix %>" <% end %> <% if cellar.is_a? Symbol %> cellar :<%= cellar %> - <% elsif cellar.to_s != "/usr/local/Cellar" %> + <% elsif cellar != BottleSpecification::DEFAULT_CELLAR %> cellar "<%= cellar %>" <% end %> <% if revision > 0 %> @@ -186,8 +186,8 @@ module Homebrew bottle = BottleSpecification.new bottle.root_url(root_url) if root_url - bottle.prefix HOMEBREW_PREFIX - bottle.cellar relocatable ? :any : HOMEBREW_CELLAR + bottle.prefix HOMEBREW_PREFIX.to_s + bottle.cellar relocatable ? :any : HOMEBREW_CELLAR.to_s bottle.revision bottle_revision bottle.sha1 bottle_path.sha1 => bottle_tag |