Merge pull request #1265 from AlternateRT/brew-style-conformant

Various fixes to Homebrew Cask

.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

Casks/zen-browser.rb

@@ -1,21 +1,31 @@
-cask("zen-browser") do
-  arch(arm: "aarch64", intel: "x64")
-  version("1.0.0-a.34")
-  sha256(arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6")
+cask "zen-browser" do
+  arch arm: "aarch64", intel: "x64"
 
-  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/")
+  version "1.0.0-a.37"
+  sha256 arm:   "0cf18406f61225c53ca20391b37dcdcbfd3dd80bf758639b56962e38085e529d",
+         intel: "4de8907641989639ee159681cd131a22a20fcf414373543a62ee0f9df2739845"
 
-  zap trash: [
-    "~/Library/Preferences/org.mozilla.com.zen.browser.plist",
-    "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState"
-  ]
+  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/"
 
-  app("Zen Browser.app")
+  auto_updates true
+  depends_on macos: ">= :catalina"
+
+  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: [
+        "~/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

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!
    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date" />
  </picture>
 </a>
-