From 134671f5b508d8c2a48f632efe11db0ac8e5e952 Mon Sep 17 00:00:00 2001 From: Anson Hoyt Date: Mon, 28 Aug 2023 08:56:22 -0400 Subject: [PATCH 01/10] sonic-pi 4.4.0, now with Apple Silicon builds --- Casks/s/sonic-pi.rb | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index bc2ed8edc5..46a347a46f 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -1,8 +1,26 @@ cask "sonic-pi" do - version "4.3.0" - sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" + arch arm: "arm64", intel: "x64" + + if MacOS.version <= :mojave + version "3.3.1" + sha256 "0bfd12f930311e8ef1c7306dc9c012cfcc1f8e50710fd26a8c18ba003573a506" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + elsif MacOS.version <= :catalina + version "4.3.0" + sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + elsif MacOS.version <= :monterey + version "4.4.0" + sha256 "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + else + version "4.4.0" + sha256 arm: "fa4020ac4c3259bbed6d456c4b0e13126fe404c1b474654bffd583335f5d0ab5", + intel: "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" + arch_bonus = Hardware::CPU.intel? ? "-Intel" : "" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for#{arch_bonus}-Mac-#{arch}-v#{version.dots_to_hyphens}.dmg" + end - url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" name "Sonic Pi" desc "Code-based music creation and performance tool" homepage "https://sonic-pi.net/" @@ -15,5 +33,7 @@ cask "sonic-pi" do end end + depends_on macos: ">= :high_sierra" + app "Sonic Pi.app" end From 781999f4c7d671cb13826e6b3d5db4f81d5a0559 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 29 Aug 2023 14:00:54 +1000 Subject: [PATCH 02/10] sonic-pi: update to `on_system` blocks --- Casks/s/sonic-pi.rb | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index 46a347a46f..b1a6f60669 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -1,23 +1,36 @@ cask "sonic-pi" do arch arm: "arm64", intel: "x64" - if MacOS.version <= :mojave + on_mojave :or_older do version "3.3.1" sha256 "0bfd12f930311e8ef1c7306dc9c012cfcc1f8e50710fd26a8c18ba003573a506" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" - elsif MacOS.version <= :catalina + end + on_catalina do version "4.3.0" sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" - elsif MacOS.version <= :monterey + end + on_big_sur do + version "4.3.0" + sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" + + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + end + on_monterey do version "4.4.0" sha256 "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" - else + end + on_ventura :or_newer do + arch_bonus = on_arch_conditional intel: "-Intel" version "4.4.0" sha256 arm: "fa4020ac4c3259bbed6d456c4b0e13126fe404c1b474654bffd583335f5d0ab5", intel: "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" - arch_bonus = Hardware::CPU.intel? ? "-Intel" : "" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for#{arch_bonus}-Mac-#{arch}-v#{version.dots_to_hyphens}.dmg" end From bbab58f41ce2bc1732f8499f469bf5c325c6b5f2 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 29 Aug 2023 14:07:35 +1000 Subject: [PATCH 03/10] sonic-pi: update to `on_system` blocks --- Casks/s/sonic-pi.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index b1a6f60669..984397f2c2 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -6,24 +6,40 @@ cask "sonic-pi" do sha256 "0bfd12f930311e8ef1c7306dc9c012cfcc1f8e50710fd26a8c18ba003573a506" url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + + livecheck do + skip "Legacy version" + end end on_catalina do version "4.3.0" sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + + livecheck do + skip "Legacy version" + end end on_big_sur do version "4.3.0" sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + + livecheck do + skip "Legacy version" + end end on_monterey do version "4.4.0" sha256 "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + + livecheck do + skip "Legacy version" + end end on_ventura :or_newer do arch_bonus = on_arch_conditional intel: "-Intel" From fea066da77466279e2703fe04e155207d26b335e Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 29 Aug 2023 14:07:52 +1000 Subject: [PATCH 04/10] sonic-pi: update to `on_system` blocks --- Casks/s/sonic-pi.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index 984397f2c2..5994d191cb 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -48,20 +48,20 @@ cask "sonic-pi" do intel: "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for#{arch_bonus}-Mac-#{arch}-v#{version.dots_to_hyphens}.dmg" + + livecheck do + url :homepage + regex(/href=.*?Sonic-Pi[^"' >]*?[._-]v?(\d+(?:[.-]\d+)+)\.dmg/i) + strategy :page_match do |page, regex| + page.scan(regex).map { |match| match[0].tr("-", ".") } + end + end end name "Sonic Pi" desc "Code-based music creation and performance tool" homepage "https://sonic-pi.net/" - livecheck do - url :homepage - regex(/href=.*?Sonic-Pi[^"' >]*?[._-]v?(\d+(?:[.-]\d+)+)\.dmg/i) - strategy :page_match do |page, regex| - page.scan(regex).map { |match| match[0].tr("-", ".") } - end - end - depends_on macos: ">= :high_sierra" app "Sonic Pi.app" From 1780f70208d06330328cb253cbd24d52dbb1b0d9 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 29 Aug 2023 14:08:49 +1000 Subject: [PATCH 05/10] sonic-pi: update to `on_system` blocks --- Casks/s/sonic-pi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index 5994d191cb..c15dc4e5fa 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -25,7 +25,7 @@ cask "sonic-pi" do version "4.3.0" sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" - url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Intel-Mac-x64-v#{version.dots_to_hyphens}.dmg" livecheck do skip "Legacy version" From 6567f53474fc2dd6720e0c731c702b28bc15a451 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 29 Aug 2023 14:10:59 +1000 Subject: [PATCH 06/10] sonic-pi: update to `on_system` blocks --- Casks/s/sonic-pi.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index c15dc4e5fa..8739dc93d6 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -1,6 +1,6 @@ cask "sonic-pi" do arch arm: "arm64", intel: "x64" - + on_mojave :or_older do version "3.3.1" sha256 "0bfd12f930311e8ef1c7306dc9c012cfcc1f8e50710fd26a8c18ba003573a506" @@ -22,10 +22,10 @@ cask "sonic-pi" do end end on_big_sur do - version "4.3.0" - sha256 "c5646b221d61ba55c8e1025a646718d1244333bd57e2a7bccc8eb71c5a7be585" + version "4.4.0" + sha256 "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" - url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Intel-Mac-x64-v#{version.dots_to_hyphens}.dmg" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" livecheck do skip "Legacy version" From 7f755f79730aba674e6aff0993da4cc5864f1a9b Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 29 Aug 2023 14:16:00 +1000 Subject: [PATCH 07/10] sonic-pi: update to `on_system` blocks --- Casks/s/sonic-pi.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index 8739dc93d6..25abaa720d 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -25,7 +25,7 @@ cask "sonic-pi" do version "4.4.0" sha256 "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" - url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Intel-Mac-x64-v#{version.dots_to_hyphens}.dmg" livecheck do skip "Legacy version" @@ -35,7 +35,7 @@ cask "sonic-pi" do version "4.4.0" sha256 "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" - url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Mac-x64-v#{version.dots_to_hyphens}.dmg" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-Intel-Mac-x64-v#{version.dots_to_hyphens}.dmg" livecheck do skip "Legacy version" From 327e4737884cbfaea23d95a57a379b35d55b7783 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 29 Aug 2023 14:29:44 +1000 Subject: [PATCH 08/10] sonic-pi: fix style --- Casks/s/sonic-pi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index 25abaa720d..7d448ac722 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -1,6 +1,6 @@ cask "sonic-pi" do arch arm: "arm64", intel: "x64" - + on_mojave :or_older do version "3.3.1" sha256 "0bfd12f930311e8ef1c7306dc9c012cfcc1f8e50710fd26a8c18ba003573a506" From 55c9a16a44865426a44ec0942178887404742a3b Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Thu, 14 Sep 2023 07:40:13 -0400 Subject: [PATCH 09/10] add zap --- Casks/s/sonic-pi.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index 7d448ac722..fd1d3d57b6 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -65,4 +65,11 @@ cask "sonic-pi" do depends_on macos: ">= :high_sierra" app "Sonic Pi.app" + + zap trash: [ + "~/.config/sonic-pi.net", + "~/.sonic-pi", + "~/Library/Preferences/net.sonic-pi.app.plist", + "~/Library/Saved Application State/net.sonic-pi.app.savedState", + ] end From 023afad4ea361383d5176fea06e850c29d66df34 Mon Sep 17 00:00:00 2001 From: Miccal Matthews Date: Fri, 15 Sep 2023 08:45:53 +0800 Subject: [PATCH 10/10] Update sonic-pi.rb --- Casks/s/sonic-pi.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Casks/s/sonic-pi.rb b/Casks/s/sonic-pi.rb index fd1d3d57b6..26d1a67b76 100644 --- a/Casks/s/sonic-pi.rb +++ b/Casks/s/sonic-pi.rb @@ -1,5 +1,5 @@ cask "sonic-pi" do - arch arm: "arm64", intel: "x64" + arch arm: "Mac-arm64", intel: "Intel-Mac-x64" on_mojave :or_older do version "3.3.1" @@ -42,16 +42,15 @@ cask "sonic-pi" do end end on_ventura :or_newer do - arch_bonus = on_arch_conditional intel: "-Intel" version "4.4.0" sha256 arm: "fa4020ac4c3259bbed6d456c4b0e13126fe404c1b474654bffd583335f5d0ab5", intel: "7ed0e94cf92fdf2e8d51ee42c5f7c3478fbcef9630eb12dccf203f5e72bb517f" - url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for#{arch_bonus}-Mac-#{arch}-v#{version.dots_to_hyphens}.dmg" + url "https://sonic-pi.net/files/releases/v#{version}/Sonic-Pi-for-#{arch}-v#{version.dots_to_hyphens}.dmg" livecheck do url :homepage - regex(/href=.*?Sonic-Pi[^"' >]*?[._-]v?(\d+(?:[.-]\d+)+)\.dmg/i) + regex(/href=.*?Sonic[._-]Pi[._-]for[._-]#{arch}[._-]v?(\d+(?:[.-]\d+)+)\.dmg/i) strategy :page_match do |page, regex| page.scan(regex).map { |match| match[0].tr("-", ".") } end