diff options
| author | Masaki Muranaka | 2014-05-09 17:38:12 +0900 |
|---|---|---|
| committer | Adam Vandenberg | 2014-05-11 15:33:14 -0700 |
| commit | 176e5ab72cc50881cf3de48794768bf0625ac9c4 (patch) | |
| tree | acc8e83562383053db3cd95e847ab2a16d45525f /Library | |
| parent | 7609cf88c5992a31d6ab0db49aa0c77dea87193c (diff) | |
| download | brew-176e5ab72cc50881cf3de48794768bf0625ac9c4.tar.bz2 | |
Add an option "--root_url=" to bottle command.
Closes Homebrew/homebrew#29081.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Contributions/brew_bash_completion.sh | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh index b69dbdd07..61c81361f 100644 --- a/Library/Contributions/brew_bash_completion.sh +++ b/Library/Contributions/brew_bash_completion.sh @@ -140,7 +140,7 @@ _brew_bottle () local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --*) - __brewcomp "--merge --rb --write" + __brewcomp "--merge --rb --write --root_url=" return ;; esac diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 71e12af38..42b1daba6 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -9,6 +9,9 @@ require 'extend/pathname' BOTTLE_ERB = <<-EOS bottle do + <% if root_url != BottleSpecification.new.root_url %> + root_url "<%= root_url %>" + <% end %> <% if prefix.to_s != "/usr/local" %> prefix "<%= prefix %>" <% end %> @@ -181,7 +184,10 @@ module Homebrew extend self end end + root_url = ARGV.value("root_url") + bottle = BottleSpecification.new + bottle.root_url(root_url) if root_url bottle.prefix HOMEBREW_PREFIX bottle.cellar relocatable ? :any : HOMEBREW_CELLAR bottle.revision bottle_revision |