From 50a468431f4f3eecfd8dbc5bb8769f7e3bcb3dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= <info@vitorgalvao.com>
Date: Sun, 12 Apr 2020 18:37:10 +0100
Subject: [PATCH] find-appcast: remove inline rescue in favour of map (#80450)

---
 developer/bin/find-appcast | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/developer/bin/find-appcast b/developer/bin/find-appcast
index 04f5527bdc..fcb1fc7610 100755
--- a/developer/bin/find-appcast
+++ b/developer/bin/find-appcast
@@ -48,7 +48,7 @@ def find_electron_builder(app)
   channel = data['channel']
   name = data['name']
   owner = data['owner']
-  path = data['path'].sub(%r{^/(.*)/$}, '\1') rescue nil
+  path = data['path']
   region = data['region']
   repo = data['repo']
   url = data['url']
@@ -63,7 +63,7 @@ def find_electron_builder(app)
     "https://s3.amazonaws.com/#{bucket}/#{path}/latest-mac.yml",
     "https://#{name}.#{region}.digitaloceanspaces.com/latest-mac.yml",
     "https://#{name}.#{region}.digitaloceanspaces.com/#{path}/latest-mac.yml",
-  ]
+  ].map { |appcast| appcast.gsub(%r{(?<!:)/{2,}}, '/') } # Collapse groups of two or more forward slahses into one, except when preceded by a colon
 
   unless verify_appcast('electron-builder', *possible_appcasts)
     warn <<~MESSAGE