From f1134c50c10141684acf202c4948ec870d27a75a Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:52:23 +0200 Subject: [PATCH 1/9] Fixed stanza order in cask file Fixed the stanza order by running brew style --fix zen-browser --- Casks/zen-browser.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index 8d6d7bf24..7051031ae 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -1,21 +1,23 @@ cask("zen-browser") do arch(arm: "aarch64", intel: "x64") + version("1.0.0-a.34") - sha256(arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6") + sha256(arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", + intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6") url("https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg") name("Zen Browser") desc("Beautifully designed, privacy-focused browser packed with awesome features") homepage("https://zen-browser.app/") - zap trash: [ - "~/Library/Preferences/org.mozilla.com.zen.browser.plist", - "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState" - ] - app("Zen Browser.app") postflight do system("xattr -c '/Applications/Zen Browser.app/'") end + + zap trash: [ + "~/Library/Preferences/org.mozilla.com.zen.browser.plist", + "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState", + ] end From f7612bd61a2d60352cb55bc7344e2a0054c82dfd Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:54:35 +0200 Subject: [PATCH 2/9] Make cask style conformant to Homebrew guidelines --- Casks/zen-browser.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index 7051031ae..8d453d9b4 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -1,19 +1,19 @@ -cask("zen-browser") do - arch(arm: "aarch64", intel: "x64") +cask "zen-browser" do + arch arm: "aarch64", intel: "x64" - version("1.0.0-a.34") - sha256(arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", - intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6") + version "1.0.0-a.34" + sha256 arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", + intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6" - url("https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg") - name("Zen Browser") - desc("Beautifully designed, privacy-focused browser packed with awesome features") - homepage("https://zen-browser.app/") + url "https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg" + name "Zen Browser" + desc "Beautifully designed, privacy-focused browser packed with awesome features" + homepage "https://zen-browser.app/" - app("Zen Browser.app") + app "Zen Browser.app" postflight do - system("xattr -c '/Applications/Zen Browser.app/'") + system "xattr -c '/Applications/Zen Browser.app/'" end zap trash: [ From 700d1e935774da8de6378508504c60bc661a6413 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:55:27 +0200 Subject: [PATCH 3/9] Add url verification to cask --- Casks/zen-browser.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index 8d453d9b4..6b6d510ac 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -5,7 +5,8 @@ cask "zen-browser" do sha256 arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6" - url "https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg" + url "https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg", + verified: "github.com/zen-browser/desktop/" name "Zen Browser" desc "Beautifully designed, privacy-focused browser packed with awesome features" homepage "https://zen-browser.app/" From 00b8d3443d50547423c2f736aa8dbe45e536a774 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:56:21 +0200 Subject: [PATCH 4/9] Add auto_updates and depends_on stanza to cask --- Casks/zen-browser.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index 6b6d510ac..aed7d4888 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -11,6 +11,9 @@ cask "zen-browser" do desc "Beautifully designed, privacy-focused browser packed with awesome features" homepage "https://zen-browser.app/" + auto_updates true + depends_on macos: ">= :catalina" + app "Zen Browser.app" postflight do From aab319623ce39b14d60033c31db1950248266b82 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:59:26 +0200 Subject: [PATCH 5/9] Only remove quarantine attribute on postflight Make cask only remove com.apple.quarantine as opposed to all attributes --- Casks/zen-browser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index aed7d4888..7eaf83656 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -17,7 +17,7 @@ cask "zen-browser" do app "Zen Browser.app" postflight do - system "xattr -c '/Applications/Zen Browser.app/'" + system "xattr -d com.apple.quarantine '/Applications/Zen Browser.app/'" end zap trash: [ From 6605249b2a879ccec7016d25f03d8ef6ba0c61ce Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:05:40 +0200 Subject: [PATCH 6/9] Expand zap stanza to clear more files on uninstall --- Casks/zen-browser.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index 7eaf83656..825f13319 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -21,7 +21,11 @@ cask "zen-browser" do end zap trash: [ - "~/Library/Preferences/org.mozilla.com.zen.browser.plist", - "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState", - ] + "~/Library/Application Support/zen", + "~/Library/Caches/Mozilla/updates/Applications/Zen Browser", + "~/Library/Caches/zen", + "~/Library/Preferences/org.mozilla.com.zen.browser.plist", + "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState", + ], + rmdir: "~/Library/Caches/Mozilla" end From 8f893d0cf58a4ee6814cd283db906f7e022409c2 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:09:19 +0200 Subject: [PATCH 7/9] Update version number on cask file --- Casks/zen-browser.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index 825f13319..0fcabbc57 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -1,9 +1,9 @@ cask "zen-browser" do arch arm: "aarch64", intel: "x64" - version "1.0.0-a.34" - sha256 arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", - intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6" + version "1.0.0-a.37" + sha256 arm: "0cf18406f61225c53ca20391b37dcdcbfd3dd80bf758639b56962e38085e529d", + intel: "4de8907641989639ee159681cd131a22a20fcf414373543a62ee0f9df2739845" url "https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg", verified: "github.com/zen-browser/desktop/" From c1c616e4310308728c1ac16ff51a6df86ce3e1c8 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:12:59 +0200 Subject: [PATCH 8/9] Update update-homebrew.sh Updates update-homebrew.sh to work with the style conformant cask --- .github/workflows/src/update-homebrew.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/src/update-homebrew.sh b/.github/workflows/src/update-homebrew.sh index a964da088..ffa5206fd 100644 --- a/.github/workflows/src/update-homebrew.sh +++ b/.github/workflows/src/update-homebrew.sh @@ -1,8 +1,8 @@ latest_version=$1 -sed -i "s/version(.*)/version('${latest_version}')/" ./Casks/zen-browser.rb +sed -i "s/version \".*\"/version \"${latest_version}\"/" ./Casks/zen-browser.rb sha_x64=$(shasum -a 256 zen.macos-x64.dmg) sha_arm=$(shasum -a 256 zen.macos-aarch64.dmg) -sed -i "s/sha256(.*)/sha256(arm:'${sha_arm}', intel:'${sha_x64}')/" ./Casks/zen-browser.rb +sed -i "N;s/sha256 arm: \".*\",\n intel: \".*\"/sha256 arm: \"${sha_arm}\",\n intel: \"${sha_x64}\"/" ./Casks/zen-browser.rb From cb83aca94af59aeddf97690f9a05f32db9538e55 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:20:39 +0200 Subject: [PATCH 9/9] Fix Homebrew installation/upgrade instructions --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d3e979def..97f73ab8c 100644 --- a/README.md +++ b/README.md @@ -40,18 +40,18 @@ Zen is built with performance in mind, and we have optimized the browser to be a ## MacOS ### Homebrew (recommended) -You can install the Zen Browser using Homebrew: +You can install the Zen Browser using Homebrew: ``` -brew tap zen-browser/browser https://github.com/zen-browser/desktop.git -brew install zen-browser +brew tap zen-browser/browser https://github.com/zen-browser/desktop.git +brew install --cask zen-browser ``` -To upgrade the browser to a newer version, you can either use the embedded update functionality in `About Zen` or use the following commands: +To upgrade the browser to a newer version, you can either use the embedded update functionality in `About Zen` or use the following commands: ``` brew update -brew upgrade zen-browser +brew upgrade --greedy zen-browser ``` ### Manual installation @@ -71,7 +71,7 @@ git clone https://github.com/zen-browser/desktop.git --recurse-submodules cd desktop ``` -Install dependencies +Install dependencies ```bash npm i @@ -121,4 +121,3 @@ Zen couldn't be in its current state without the help of these amazing projects! Star History Chart -