Merge pull request #160539 from samford/tunnelblick-update-livecheck

Casks/t/tunnelblick.rb

@@ -1,22 +1,26 @@
 cask "tunnelblick" do
-  version "3.8.8e,5779"
+  version "3.8.8e,5779.1"
   sha256 "6eeecb9184c7587363bbd16032e9f1d17385f5da6cea9d6229c8127812783493"
 
-  url "https://github.com/Tunnelblick/Tunnelblick/releases/download/v#{version.csv.first}/Tunnelblick_#{version.csv.first}_build_#{version.csv.second}.1.dmg",
+  url "https://github.com/Tunnelblick/Tunnelblick/releases/download/v#{version.csv.first}/Tunnelblick_#{version.csv.first}_build_#{version.csv.second}.dmg",
       verified: "github.com/Tunnelblick/Tunnelblick/"
   name "Tunnelblick"
   desc "Free and open-source OpenVPN client"
   homepage "https://www.tunnelblick.net/"
 
   livecheck do
-    url "https://github.com/Tunnelblick/Tunnelblick/releases"
-    regex(/Tunnelblick\s+?(\d+(?:\.\d+)*[a-z]?)\s+?\(build\s+?(\d+)/i)
-    strategy :page_match do |page, regex|
-      page.scan(regex).map { |match| "#{match[0]},#{match[1]}" }
+    url :url
+    regex(/Tunnelblick\s+v?(\d+(?:\.\d+)+[a-z]?)\s+\(build\s+(\d+(?:\.\d+)*)\)/i)
+    strategy :github_latest do |json, regex|
+      match = json["name"]&.match(regex)
+      next if match.blank?
+
+      "#{match[1]},#{match[2]}"
     end
   end
 
   auto_updates true
+  depends_on macos: ">= :high_sierra"
 
   app "Tunnelblick.app"