From 16afe417ed07bc4ba0dc87cd6a5a2992bd7d360c Mon Sep 17 00:00:00 2001
From: Bevan Kay <email@bevankay.me>
Date: Thu, 12 Oct 2023 18:35:12 +1100
Subject: [PATCH 1/3] opal -> opal-composer: rename, rework cask

---
 Casks/o/opal-composer.rb | 27 ++++++++++++++++++++++
 Casks/o/opal.rb          | 50 ----------------------------------------
 2 files changed, 27 insertions(+), 50 deletions(-)
 create mode 100644 Casks/o/opal-composer.rb
 delete mode 100644 Casks/o/opal.rb

diff --git a/Casks/o/opal-composer.rb b/Casks/o/opal-composer.rb
new file mode 100644
index 0000000000..c83e3e9e61
--- /dev/null
+++ b/Casks/o/opal-composer.rb
@@ -0,0 +1,27 @@
+cask "opal-composer" do
+  version "1.1.1,5"
+  sha256 "82ddfe5c8375caf3523b7409fa32fc34612b5d8e755fe9a1d4b08502112c5bda"
+
+  url "https://updates.opal.camera/release/Opal_Composer_#{version.csv.first}_#{version.csv.second}.dmg"
+  name "Opal Composer"
+  desc "Professional webcam software for the Opal C1"
+  homepage "https://opalcamera.com/opal-composer"
+
+  livecheck do
+    url "https://public-opal-bucket.s3.us-east-2.amazonaws.com/release/appcast.xml"
+    strategy :sparkle
+  end
+
+  depends_on macos: ">= :monterey"
+
+  app "Opal Composer.app"
+
+  zap trash: [
+    "~/Library/Application Scripts/97Z3HJWCRT.com.opalcamera.v2.Opal",
+    "~/Library/Caches/com.opalcamera.Opal.v2",
+    "~/Library/Group Containers/97Z3HJWCRT.com.opalcamera.v2.Opal",
+    "~/Library/HTTPStorages/com.opalcamera.Opal.v2",
+    "~/Library/Preferences/97Z3HJWCRT.com.opalcamera.v2.Opal.plist",
+    "~/Library/Preferences/com.opalcamera.Opal.v2.plist",
+  ]
+end
diff --git a/Casks/o/opal.rb b/Casks/o/opal.rb
deleted file mode 100644
index 46904d33d4..0000000000
--- a/Casks/o/opal.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-cask "opal" do
-  version "0.26"
-  sha256 "b7d95fa3188826d2a0332c596f960aa88ca706e2bdc00e7d9a26fc05834c0a46"
-
-  url "https://opalcamera.sfo3.digitaloceanspaces.com/Opal%20#{version}.pkg",
-      verified: "opalcamera.sfo3.digitaloceanspaces.com/"
-  name "Opal"
-  desc "Professional webcam software for the Opal C1"
-  homepage "https://faqs.opal.camera/download"
-
-  livecheck do
-    url "https://opalcamera.com/download"
-    regex(/Opal\s+Build\s+(\d+(?:\.\d+)+)/i)
-  end
-
-  depends_on macos: ">= :monterey"
-
-  pkg "Opal #{version}.pkg"
-
-  uninstall pkgutil:   "com.opalcamera.OpalCamera",
-            launchctl: [
-              "com.opalcamera.cameraExtensionShim",
-              "com.opalcamera.OpalCamera.installUpdate.daemon",
-              "com.opalcamera.OpalCamera.startOnUsbPlugged.agent",
-              "com.opalcamera.OpalCamera.uninstall.daemon",
-              "com.opalcamera.OpalCameraStartAtLogin",
-              "com.opalcamera.vcam.assistant",
-            ],
-            quit:      "com.opalcamera.OpalCamera",
-            delete:    [
-              "/Library/LaunchDaemons/com.opalcamera.cameraExtensionShim.plist",
-              "/Library/LaunchDaemons/com.opalcamera.OpalCamera.installUpdate.daemon.plist",
-              "/Library/LaunchDaemons/com.opalcamera.OpalCamera.uninstall.daemon.plist",
-            ]
-
-  zap trash: [
-    "~/Library/Application Scripts/com.opalcamera.OpalCameraStartAtLogin",
-    "~/Library/Application Support/com.opalcamera.OpalCamera",
-    "~/Library/Caches/com.opalcamera.OpalCamera",
-    "~/Library/Caches/com.opalcamera.OpalCameraDeviceService",
-    "~/Library/Caches/com.opalcamera.OpalCameraVideoService",
-    "~/Library/Containers/com.opalcamera.OpalCameraStartAtLogin",
-    "~/Library/HTTPStorages/com.opalcamera.OpalCamera",
-    "~/Library/HTTPStorages/com.opalcamera.OpalCameraDeviceService",
-    "~/Library/HTTPStorages/com.opalcamera.OpalCameraVideoService",
-    "~/Library/Logs/com.opalcamera.OpalCamera",
-    "~/Library/Preferences/com.opalcamera.OpalCamera.plist",
-    "~/Library/Preferences/group.97Z3HJWCRT.com.opalcamera.Opal.plist",
-  ]
-end

From fa369e68b4d28e719145c0ad89bb7e8cbb668c86 Mon Sep 17 00:00:00 2001
From: Bevan Kay <email@bevankay.me>
Date: Thu, 12 Oct 2023 18:35:50 +1100
Subject: [PATCH 2/3] opal -> opal-composer: cask rename

---
 cask_renames.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cask_renames.json b/cask_renames.json
index 9d9fbda6c0..5be1d6d330 100644
--- a/cask_renames.json
+++ b/cask_renames.json
@@ -6,6 +6,7 @@
   "hepta": "heptabase",
   "mouse-fix": "mac-mouse-fix",
   "mysteriumvpn": "mysteriumdark",
+  "opal": "opal-composer",
   "remotion": "multiapp",
   "streamlabs-obs": "streamlabs",
   "sublime-text3": "sublime-text"

From eaf4b786aac40c5d4fdb44d892eb45c411443c49 Mon Sep 17 00:00:00 2001
From: Bevan Kay <email@bevankay.me>
Date: Thu, 12 Oct 2023 20:16:10 +1000
Subject: [PATCH 3/3] Update opal-composer.rb

---
 Casks/o/opal-composer.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Casks/o/opal-composer.rb b/Casks/o/opal-composer.rb
index c83e3e9e61..cd61646af8 100644
--- a/Casks/o/opal-composer.rb
+++ b/Casks/o/opal-composer.rb
@@ -2,7 +2,8 @@ cask "opal-composer" do
   version "1.1.1,5"
   sha256 "82ddfe5c8375caf3523b7409fa32fc34612b5d8e755fe9a1d4b08502112c5bda"
 
-  url "https://updates.opal.camera/release/Opal_Composer_#{version.csv.first}_#{version.csv.second}.dmg"
+  url "https://updates.opal.camera/release/Opal_Composer_#{version.csv.first}_#{version.csv.second}.dmg",
+      verified: "updates.opal.camera/release/"
   name "Opal Composer"
   desc "Professional webcam software for the Opal C1"
   homepage "https://opalcamera.com/opal-composer"