From 96ba5edd4097da861b32a399eb1c149a88d570b9 Mon Sep 17 00:00:00 2001 From: Dzianis Dashkevich Date: Sat, 30 Dec 2023 13:09:35 +0300 Subject: [PATCH 1/2] fliqlo: fix cask for macOS Ventura and older --- Casks/f/fliqlo.rb | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/Casks/f/fliqlo.rb b/Casks/f/fliqlo.rb index b1e992c99d..7f31ff1b70 100644 --- a/Casks/f/fliqlo.rb +++ b/Casks/f/fliqlo.rb @@ -1,6 +1,25 @@ cask "fliqlo" do - version "1.9.1" - sha256 "99785b30f28e4b252950758d944d4f2e822daf597de5f2612ab778321cb4a677" + on_ventura :or_older do + version "1.8.6" + sha256 "a0d0fac34347cba027e067ad46b04efcff2220f7d5e712de4dcaaf9844c31c1a" + + livecheck do + skip "Legacy version" + end + + depends_on macos: "<= :ventura" + end + on_sonoma :or_newer do + version "1.9.1" + sha256 "99785b30f28e4b252950758d944d4f2e822daf597de5f2612ab778321cb4a677" + + livecheck do + url :homepage + regex(%r{href=.*?/Fliqlo%20v?(\d+(?:\.\d+)+)\.dmg}i) + end + + depends_on macos: ">= :sonoma" + end url "https://fliqlo.com/download/Fliqlo%20#{version}.dmg", referer: "https://fliqlo.com/#about" @@ -8,11 +27,6 @@ cask "fliqlo" do desc "Flip clock screensaver" homepage "https://fliqlo.com/" - livecheck do - url :homepage - regex(%r{href=.*?/Fliqlo%20v?(\d+(?:\.\d+)+)\.dmg}i) - end - screen_saver "Fliqlo.saver" zap trash: "/Library/Screen Savers/Fliqlo.saver" From 8d0a4888023160d79483072f9430750431ab7e70 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Sat, 30 Dec 2023 13:07:17 +0200 Subject: [PATCH 2/2] fliqlo: remove redundant depends_on and modify regex --- Casks/f/fliqlo.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Casks/f/fliqlo.rb b/Casks/f/fliqlo.rb index 7f31ff1b70..1230370338 100644 --- a/Casks/f/fliqlo.rb +++ b/Casks/f/fliqlo.rb @@ -6,8 +6,6 @@ cask "fliqlo" do livecheck do skip "Legacy version" end - - depends_on macos: "<= :ventura" end on_sonoma :or_newer do version "1.9.1" @@ -15,10 +13,8 @@ cask "fliqlo" do livecheck do url :homepage - regex(%r{href=.*?/Fliqlo%20v?(\d+(?:\.\d+)+)\.dmg}i) + regex(/href=.*?Fliqlo%20v?(\d+(?:\.\d+)+)\.dmg/i) end - - depends_on macos: ">= :sonoma" end url "https://fliqlo.com/download/Fliqlo%20#{version}.dmg",