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

Add an option "--root_url=" to bottle command.

Browse Source 
Closes Homebrew/homebrew#29081.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
Masaki Muranaka 2014-05-09 17:38:12 +09:00 committed by Adam Vandenberg
parent 7609cf88c5
commit 176e5ab72c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Contributions/brew_bash_completion.sh
View File

@ -140,7 +140,7 @@ _brew_bottle ()
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
--*) --*)
__brewcomp "--merge --rb --write" __brewcomp "--merge --rb --write --root_url="
return return
;; ;;
esac esac

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

@ -9,6 +9,9 @@ require 'extend/pathname'
BOTTLE_ERB = <<-EOS BOTTLE_ERB = <<-EOS
bottle do bottle do
<% if root_url != BottleSpecification.new.root_url %>
root_url "<%= root_url %>"
<% end %>
<% if prefix.to_s != "/usr/local" %> <% if prefix.to_s != "/usr/local" %>
prefix "<%= prefix %>" prefix "<%= prefix %>"
<% end %> <% end %>
@ -181,7 +184,10 @@ module Homebrew extend self
end end
end end
root_url = ARGV.value("root_url")
bottle = BottleSpecification.new bottle = BottleSpecification.new
bottle.root_url(root_url) if root_url
bottle.prefix HOMEBREW_PREFIX bottle.prefix HOMEBREW_PREFIX
bottle.cellar relocatable ? :any : HOMEBREW_CELLAR bottle.cellar relocatable ? :any : HOMEBREW_CELLAR
bottle.revision bottle_revision bottle.revision bottle_revision