From aacb65a1ec4a4c645379412fb5d557703a2c65bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Sun, 20 Oct 2019 18:39:27 +0100 Subject: [PATCH] parse_electron_builder_appcast: support s3 buckets without a channel (#71143) --- developer/bin/parse_electron_builder_appcast | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/developer/bin/parse_electron_builder_appcast b/developer/bin/parse_electron_builder_appcast index 51daccaa2f..7edd27e917 100755 --- a/developer/bin/parse_electron_builder_appcast +++ b/developer/bin/parse_electron_builder_appcast @@ -13,15 +13,20 @@ def parse(app_path) case data["provider"] when "generic" url = data["url"] - puts "#{url}/latest-mac.yml" + "#{url}/latest-mac.yml" when "github" owner = data["owner"] repo = data["repo"] - puts "https://github.com/#{owner}/#{repo}/releases.atom" + "https://github.com/#{owner}/#{repo}/releases.atom" when "s3" bucket = data["bucket"] channel = data["channel"] - puts "https://#{bucket}.s3.amazon-aws.yml/#{channel}/latest-mac.yml" + + return "https://#{bucket}.s3.amazon-aws.yml/#{channel}/latest-mac.yml" if channel + + region = data["region"] + path = data["path"].sub(%r{^/(.*)/$}, '\1') + "https://s3-#{region}.amazonaws.com/#{bucket}/#{path}/latest-mac.yml" end end @@ -42,4 +47,4 @@ unless ARGV.length == 1 exit 1 end -parse(ARGV[0]) +puts parse(ARGV[0])