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

pr-upload: Add argument root-url

Browse Source 
The argument root-url is needed for third-party taps.
This commit is contained in:
Shaun Jackman 2020-04-20 10:31:59 -07:00
parent cacc8183ce
commit 29ae567868
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/dev-cmd/pr-upload.rb
View File

@ -19,6 +19,8 @@ module Homebrew
description: "Print what would be done rather than doing it." description: "Print what would be done rather than doing it."
flag "--bintray-org=", flag "--bintray-org=",
description: "Upload to the specified Bintray organisation (default: homebrew)." description: "Upload to the specified Bintray organisation (default: homebrew)."
flag "--root-url=",
description: "Use the specified <URL> as the root of the bottle's URL instead of Homebrew's default."
end end
end end
@ -28,10 +30,15 @@ module Homebrew
bintray_org = args.bintray_org || "homebrew" bintray_org = args.bintray_org || "homebrew"
bintray = Bintray.new(org: bintray_org) bintray = Bintray.new(org: bintray_org)
bottle_args = ["bottle", "--merge", "--write"]
bottle_args << "--root-url=#{args.root_url}" if args.root_url
odie "No JSON files found in the current working directory" if Dir["*.json"].empty?
bottle_args += Dir["*.json"]
if args.dry_run? if args.dry_run?
puts "brew bottle --merge --write #{Dir["*.json"].join " "}" puts "brew #{bottle_args.join " "}"
else else
system HOMEBREW_BREW_FILE, "bottle", "--merge", "--write", *Dir["*.json"] system HOMEBREW_BREW_FILE, "bottle", *bottle_args
end end
if args.dry_run? if args.dry_run?