From 3cc44f1914067776b6f3ed77d3f95f596b90a451 Mon Sep 17 00:00:00 2001
From: Nihaal Sangha <nihaal.git@gmail.com>
Date: Mon, 2 Oct 2023 12:08:38 +0100
Subject: [PATCH 1/3] Add Apple silicon to `marvin`

---
 Casks/m/marvin.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Casks/m/marvin.rb b/Casks/m/marvin.rb
index 17e1929f21..fc5a406be4 100644
--- a/Casks/m/marvin.rb
+++ b/Casks/m/marvin.rb
@@ -1,9 +1,13 @@
 cask "marvin" do
-  version "1.63.0"
-  sha256 "8f6c4ca13956c41731086e2112fe79418e00248544e61d713b3ea9ff8d89c77a"
+  arch arm: "-arm64"
+  hostname_arch = on_arch_conditional arm: "amarm", intel: "amazingmarvin"
 
-  url "https://amazingmarvin.s3.amazonaws.com/Marvin-#{version}.dmg",
-      verified: "amazingmarvin.s3.amazonaws.com/"
+  version "1.63.0"
+  sha256 arm:   "0e0bc18c1274f3f6a2d45dd45ddd6448f0a917d8de5cd68a3a69eaabd0595903",
+         intel: "8f6c4ca13956c41731086e2112fe79418e00248544e61d713b3ea9ff8d89c77a"
+
+  url "https://#{hostname_arch}.s3.amazonaws.com/Marvin-#{version}#{arch}.dmg",
+      verified: "#{hostname_arch}.s3.amazonaws.com/"
   name "Amazing Marvin"
   desc "Personal productivity app"
   homepage "https://www.amazingmarvin.com/"

From 0f47b6e13235cb532e483bf84cee5cc206bbd32f Mon Sep 17 00:00:00 2001
From: Nihaal Sangha <nihaal.git@gmail.com>
Date: Mon, 2 Oct 2023 12:24:56 +0100
Subject: [PATCH 2/3] Use `electron_builder` livecheck in `marvin`

---
 Casks/m/marvin.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Casks/m/marvin.rb b/Casks/m/marvin.rb
index fc5a406be4..6ccdf38a45 100644
--- a/Casks/m/marvin.rb
+++ b/Casks/m/marvin.rb
@@ -13,8 +13,8 @@ cask "marvin" do
   homepage "https://www.amazingmarvin.com/"
 
   livecheck do
-    url "http://amazingmarvin.s3-website-us-east-1.amazonaws.com/Marvin.dmg"
-    strategy :header_match
+    url "https://#{hostname_arch}.s3.amazonaws.com/latest-mac.yml"
+    strategy :electron_builder
   end
 
   app "Marvin.app"

From 69870b732c6080c1048a603eb33b6acbf94315f5 Mon Sep 17 00:00:00 2001
From: Nihaal Sangha <nihaal.git@gmail.com>
Date: Mon, 2 Oct 2023 12:25:33 +0100
Subject: [PATCH 3/3] Use zip instead of dmg for `marvin`

---
 Casks/m/marvin.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Casks/m/marvin.rb b/Casks/m/marvin.rb
index 6ccdf38a45..9038dd6a84 100644
--- a/Casks/m/marvin.rb
+++ b/Casks/m/marvin.rb
@@ -3,10 +3,10 @@ cask "marvin" do
   hostname_arch = on_arch_conditional arm: "amarm", intel: "amazingmarvin"
 
   version "1.63.0"
-  sha256 arm:   "0e0bc18c1274f3f6a2d45dd45ddd6448f0a917d8de5cd68a3a69eaabd0595903",
-         intel: "8f6c4ca13956c41731086e2112fe79418e00248544e61d713b3ea9ff8d89c77a"
+  sha256 arm:   "46bd20dbef2ca137e9452fec120ac454b4eeca038954ea2af054eb4d830785d6",
+         intel: "3a3c44968e66274785c928545db34833d3c9369dd2fee17288de7054ce78ae66"
 
-  url "https://#{hostname_arch}.s3.amazonaws.com/Marvin-#{version}#{arch}.dmg",
+  url "https://#{hostname_arch}.s3.amazonaws.com/Marvin-#{version}#{arch}-mac.zip",
       verified: "#{hostname_arch}.s3.amazonaws.com/"
   name "Amazing Marvin"
   desc "Personal productivity app"