From 8f1e01e30f90270bcf7b934fbfb9da07001fb681 Mon Sep 17 00:00:00 2001
From: Bevan Kay <email@bevankay.me>
Date: Thu, 12 Oct 2023 18:05:49 +1100
Subject: [PATCH 1/2] mblock 5.4.2

---
 Casks/m/mblock.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Casks/m/mblock.rb b/Casks/m/mblock.rb
index 4d070cf5cc..4ec4c60ef9 100644
--- a/Casks/m/mblock.rb
+++ b/Casks/m/mblock.rb
@@ -1,8 +1,8 @@
 cask "mblock" do
-  version "5.4.0"
-  sha256 "cdaae703059821efb8806ce3e6fc9b44d74c5975d67fefb0d2e626565f8d6452"
+  version "5.4.2"
+  sha256 "689d7d8210051277f4d4f4466d756f7bff98973e294efd552c14b973cafa17be"
 
-  url "https://dl.makeblock.com/mblock#{version.major}/darwin/V#{version}.pkg",
+  url "https://dl.makeblock.com/mblock#{version.major}/darwin/V#{version}.dmg",
       verified: "dl.makeblock.com/"
   name "mBlock"
   desc "Coding tool designed for teaching STEAM"
@@ -15,10 +15,5 @@ cask "mblock" do
 
   depends_on macos: ">= :sierra"
 
-  pkg "V#{version}.pkg"
-
-  uninstall pkgutil: [
-    "cc.mblock",
-    "com.makeblock.pkg.mblock",
-  ]
+  app "mBlock"
 end

From d60d57be391895c405d00fb1079e9455b409d62e Mon Sep 17 00:00:00 2001
From: Razvan Azamfirei <azamfireirazvan@gmail.com>
Date: Thu, 12 Oct 2023 06:56:04 -0400
Subject: [PATCH 2/2] add zap

---
 Casks/m/mblock.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Casks/m/mblock.rb b/Casks/m/mblock.rb
index 4ec4c60ef9..20da82bae6 100644
--- a/Casks/m/mblock.rb
+++ b/Casks/m/mblock.rb
@@ -15,5 +15,12 @@ cask "mblock" do
 
   depends_on macos: ">= :sierra"
 
-  app "mBlock"
+  app "mBlock.app"
+
+  zap trash: [
+    "~/Library/Application Support/mblock",
+    "~/Library/Preferences/cc.mblock.plist",
+    "~/Library/Saved Application State/cc.mblock.savedState",
+    "~/mblock",
+  ]
 end