From 5cb0de13d43d53cd2ca0a8ec5d3adf43f26cb447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20G=C3=A9rald=20Blondel?= Date: Sun, 12 Nov 2023 12:43:54 +0800 Subject: [PATCH 1/6] Bump OBS to 30.0.0 + change architectures name --- Casks/o/obs.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Casks/o/obs.rb b/Casks/o/obs.rb index cc2e2e243a..2e3820e318 100644 --- a/Casks/o/obs.rb +++ b/Casks/o/obs.rb @@ -1,17 +1,18 @@ cask "obs" do - arch arm: "arm64", intel: "x86_64" + arch arm: "Apple", intel: "Intel" + arch_2 = on_arch_conditional arm: "arm64", intel: "x86_64" - version "29.1.3" - sha256 arm: "ad8586d6af8dd4a0039e6074cf92213340f3d2408cf87e3593fa0822cbc8a73a", - intel: "0e87051cd5ee50f9efb9c9052d79a3d598761b154308213c40accacc3c9d0895" + version "30.0.0" + sha256 arm: "a4bd98bc5bf224ef545f264188969a3d39a3e5e275686b8447e8ad7cc704aafc", + intel: "367b12299a7c226b8017108bd251093af50dfe2d86a6b0aaa54180a1da63f657" - url "https://cdn-fastly.obsproject.com/downloads/obs-studio-#{version}-macos-#{arch}.dmg" + url "https://cdn-fastly.obsproject.com/downloads/OBSs-Studio-#{version}-macos-#{arch}.dmg" name "OBS" desc "Open-source software for live streaming and screen recording" homepage "https://obsproject.com/" livecheck do - url "https://obsproject.com/osx_update/stable/updates_#{arch}.xml" + url "https://obsproject.com/osx_update/stable/updates_#{arch_2}.xml" strategy :sparkle, &:short_version end From b0a8312b969c1fc13fb86d2b16e35f5879b91795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20G=C3=A9rald=20Blondel?= Date: Sun, 12 Nov 2023 12:49:22 +0800 Subject: [PATCH 2/6] Fix typo --- Casks/o/obs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/o/obs.rb b/Casks/o/obs.rb index 2e3820e318..f3cf68bbf9 100644 --- a/Casks/o/obs.rb +++ b/Casks/o/obs.rb @@ -6,7 +6,7 @@ cask "obs" do sha256 arm: "a4bd98bc5bf224ef545f264188969a3d39a3e5e275686b8447e8ad7cc704aafc", intel: "367b12299a7c226b8017108bd251093af50dfe2d86a6b0aaa54180a1da63f657" - url "https://cdn-fastly.obsproject.com/downloads/OBSs-Studio-#{version}-macos-#{arch}.dmg" + url "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-#{version}-macos-#{arch}.dmg" name "OBS" desc "Open-source software for live streaming and screen recording" homepage "https://obsproject.com/" From 41cd4ef90cb067e60b3bf511a4ad5e86ed62ec9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20G=C3=A9rald=20Blondel?= Date: Sun, 12 Nov 2023 12:56:41 +0800 Subject: [PATCH 3/6] Fix case --- Casks/o/obs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/o/obs.rb b/Casks/o/obs.rb index f3cf68bbf9..9b60639947 100644 --- a/Casks/o/obs.rb +++ b/Casks/o/obs.rb @@ -6,7 +6,7 @@ cask "obs" do sha256 arm: "a4bd98bc5bf224ef545f264188969a3d39a3e5e275686b8447e8ad7cc704aafc", intel: "367b12299a7c226b8017108bd251093af50dfe2d86a6b0aaa54180a1da63f657" - url "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-#{version}-macos-#{arch}.dmg" + url "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-#{version}-macOS-#{arch}.dmg" name "OBS" desc "Open-source software for live streaming and screen recording" homepage "https://obsproject.com/" From 257cb7fb57dcd9097d41ceb4f64ecee84fb44c9c Mon Sep 17 00:00:00 2001 From: Miccal Matthews Date: Mon, 13 Nov 2023 04:37:39 +0800 Subject: [PATCH 4/6] Update obs.rb --- Casks/o/obs.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Casks/o/obs.rb b/Casks/o/obs.rb index 9b60639947..1ebb675fe1 100644 --- a/Casks/o/obs.rb +++ b/Casks/o/obs.rb @@ -1,19 +1,22 @@ cask "obs" do - arch arm: "Apple", intel: "Intel" - arch_2 = on_arch_conditional arm: "arm64", intel: "x86_64" + arch arm: "apple", intel: "intel" + livecheck_folder = on_arch_conditional arm: "arm64", intel: "x86_64" version "30.0.0" sha256 arm: "a4bd98bc5bf224ef545f264188969a3d39a3e5e275686b8447e8ad7cc704aafc", intel: "367b12299a7c226b8017108bd251093af50dfe2d86a6b0aaa54180a1da63f657" - url "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-#{version}-macOS-#{arch}.dmg" + url "https://cdn-fastly.obsproject.com/downloads/obs-studio-#{version}-macos-#{arch}.dmg" name "OBS" desc "Open-source software for live streaming and screen recording" - homepage "https://obsproject.com/" + homepage "https://obsproject.com/forum/list/test-builds.20/" livecheck do - url "https://obsproject.com/osx_update/stable/updates_#{arch_2}.xml" - strategy :sparkle, &:short_version + url "https://obsproject.com/osx_update/updates_#{livecheck_folder}_v2.xml" + regex(/obs[._-]studio[._-](\d+(?:[.-]\d+)+(?:(?:-beta)|(?:-rc))\d+)[._-]macos/i) + strategy :sparkle do |items, regex| + items.find { |item| item.channel == "stable" }&.url&.scan(regex)&.flatten + end end auto_updates true From 4de6af95742e06b83f0690beed50d24e9da47af0 Mon Sep 17 00:00:00 2001 From: Miccal Matthews Date: Mon, 13 Nov 2023 04:38:17 +0800 Subject: [PATCH 5/6] Update obs.rb --- Casks/o/obs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/o/obs.rb b/Casks/o/obs.rb index 1ebb675fe1..d7a694fc4e 100644 --- a/Casks/o/obs.rb +++ b/Casks/o/obs.rb @@ -9,7 +9,7 @@ cask "obs" do url "https://cdn-fastly.obsproject.com/downloads/obs-studio-#{version}-macos-#{arch}.dmg" name "OBS" desc "Open-source software for live streaming and screen recording" - homepage "https://obsproject.com/forum/list/test-builds.20/" + homepage "https://obsproject.com/" livecheck do url "https://obsproject.com/osx_update/updates_#{livecheck_folder}_v2.xml" From 9c04891970989bfbb91ab470bf3ace83912579ca Mon Sep 17 00:00:00 2001 From: Miccal Matthews Date: Mon, 13 Nov 2023 04:40:45 +0800 Subject: [PATCH 6/6] Update obs.rb --- Casks/o/obs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/o/obs.rb b/Casks/o/obs.rb index d7a694fc4e..55b4aae7ae 100644 --- a/Casks/o/obs.rb +++ b/Casks/o/obs.rb @@ -13,7 +13,7 @@ cask "obs" do livecheck do url "https://obsproject.com/osx_update/updates_#{livecheck_folder}_v2.xml" - regex(/obs[._-]studio[._-](\d+(?:[.-]\d+)+(?:(?:-beta)|(?:-rc))\d+)[._-]macos/i) + regex(/obs[._-]studio[._-]v?(\d+(?:\.\d+)+)[._-]macos[._-]#{arch}\.dmg/i) strategy :sparkle do |items, regex| items.find { |item| item.channel == "stable" }&.url&.scan(regex)&.flatten end