From 0f50bedf2e6e085d26ed3ee836edcf70f5e34aab Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Sat, 27 Apr 2024 16:24:36 -0400 Subject: [PATCH] tap_migrations: migrate some casks to `homebrew/cask` Includes: * `brave-browser-beta` * `brave-browser-dev` * `brave-browser-nightly` * `google-chrome-beta` * `google-chrome-canary` * `google-chrome-dev` * `microsoft-edge-beta` * `microsoft-edge-dev` Signed-off-by: Michael Cho --- .github/workflows/autobump.yml | 8 ----- Casks/brave-browser-beta.rb | 30 ------------------- Casks/brave-browser-dev.rb | 30 ------------------- Casks/brave-browser-nightly.rb | 30 ------------------- Casks/google-chrome-beta.rb | 54 ---------------------------------- Casks/google-chrome-canary.rb | 54 ---------------------------------- Casks/google-chrome-dev.rb | 54 ---------------------------------- Casks/microsoft-edge-beta.rb | 51 -------------------------------- Casks/microsoft-edge-dev.rb | 51 -------------------------------- tap_migrations.json | 10 ++++++- 10 files changed, 9 insertions(+), 363 deletions(-) delete mode 100644 Casks/brave-browser-beta.rb delete mode 100644 Casks/brave-browser-dev.rb delete mode 100644 Casks/brave-browser-nightly.rb delete mode 100644 Casks/google-chrome-beta.rb delete mode 100644 Casks/google-chrome-canary.rb delete mode 100644 Casks/google-chrome-dev.rb delete mode 100644 Casks/microsoft-edge-beta.rb delete mode 100644 Casks/microsoft-edge-dev.rb diff --git a/.github/workflows/autobump.yml b/.github/workflows/autobump.yml index c9876937b1d250..335df20d7b444d 100644 --- a/.github/workflows/autobump.yml +++ b/.github/workflows/autobump.yml @@ -14,20 +14,12 @@ env: CASKS: > 1password-beta android-studio-preview-canary - brave-browser-beta - brave-browser-dev - brave-browser-nightly defold-alpha discord-canary dropbox-beta emacs-nightly - google-chrome-beta - google-chrome-canary - google-chrome-dev iterm2-nightly macloggerdx-beta - microsoft-edge-beta - microsoft-edge-dev mongodb-compass-beta openscad-snapshot openshot-video-editor-daily diff --git a/Casks/brave-browser-beta.rb b/Casks/brave-browser-beta.rb deleted file mode 100644 index e179b4995affd3..00000000000000 --- a/Casks/brave-browser-beta.rb +++ /dev/null @@ -1,30 +0,0 @@ -cask "brave-browser-beta" do - arch arm: "arm64", intel: "x64" - folder = on_arch_conditional arm: "beta-arm64", intel: "beta" - - version "1.66.90.0" - sha256 arm: "134b72ff55a5e3c612fb9ea751195258d4e6322f9203bed1dee0943cb916aeaa", - intel: "035bd5a15fcfbfd24e94200126d355844ad1fdff1333c3677dc487fba377d644" - - url "https://updates-cdn.bravesoftware.com/sparkle/Brave-Browser/#{folder}/#{version.major_minor_patch.sub(".", "")}/Brave-Browser-Beta-#{arch}.dmg", - verified: "updates-cdn.bravesoftware.com/sparkle/Brave-Browser/" - name "Brave Beta" - desc "Web browser focusing on privacy" - homepage "https://brave.com/download-beta/" - - livecheck do - url "https://updates.bravesoftware.com/sparkle/Brave-Browser/#{folder}/appcast.xml" - strategy :sparkle, &:short_version - end - - auto_updates true - depends_on macos: ">= :high_sierra" - - app "Brave Browser Beta.app" - - zap trash: [ - "~/Library/Application Support/brave", - "~/Library/Preferences/com.electron.brave.plist", - "~/Library/Saved Application State/com.electron.brave.savedState", - ] -end diff --git a/Casks/brave-browser-dev.rb b/Casks/brave-browser-dev.rb deleted file mode 100644 index ccc10a6a1aff96..00000000000000 --- a/Casks/brave-browser-dev.rb +++ /dev/null @@ -1,30 +0,0 @@ -cask "brave-browser-dev" do - arch arm: "arm64", intel: "x64" - folder = on_arch_conditional arm: "dev-arm64", intel: "dev" - - version "1.61.87.0" - sha256 arm: "0416c004411443dc66c7330c9181b5bfbb31dcc9f14a6e79efab2b02aa07bc35", - intel: "bd17479a2b65e693f979c58038d82657cbf63298ea3162f5fa714ac8e0580480" - - url "https://updates-cdn.bravesoftware.com/sparkle/Brave-Browser/#{folder}/#{version.major_minor_patch.sub(".", "")}/Brave-Browser-Dev-#{arch}.dmg", - verified: "updates-cdn.bravesoftware.com/sparkle/Brave-Browser/" - name "Brave Dev" - desc "Web browser focusing on privacy" - homepage "https://brave.com/download-dev/" - - livecheck do - url "https://updates.bravesoftware.com/sparkle/Brave-Browser/#{folder}/appcast.xml" - strategy :sparkle, &:short_version - end - - auto_updates true - depends_on macos: ">= :high_sierra" - - app "Brave Browser Dev.app" - - zap trash: [ - "~/Library/Application Support/brave", - "~/Library/Preferences/com.electron.brave.plist", - "~/Library/Saved Application State/com.electron.brave.savedState", - ] -end diff --git a/Casks/brave-browser-nightly.rb b/Casks/brave-browser-nightly.rb deleted file mode 100644 index bd88091d8caa79..00000000000000 --- a/Casks/brave-browser-nightly.rb +++ /dev/null @@ -1,30 +0,0 @@ -cask "brave-browser-nightly" do - arch arm: "arm64", intel: "x64" - folder = on_arch_conditional arm: "nightly-arm64", intel: "nightly" - - version "1.67.42.0" - sha256 arm: "dd5b01c106b393ea94ffb3a59ab2151c2baa68d6abe14bf12ace39327bd9a935", - intel: "bc6dfbeefe757301ac7052a953402e27ffc62add6cd78d47cae7346d08cb5d68" - - url "https://updates-cdn.bravesoftware.com/sparkle/Brave-Browser/#{folder}/#{version.major_minor_patch.sub(".", "")}/Brave-Browser-Nightly-#{arch}.dmg", - verified: "updates-cdn.bravesoftware.com/sparkle/Brave-Browser/" - name "Brave Nightly" - desc "Web browser focusing on privacy" - homepage "https://brave.com/download-nightly/" - - livecheck do - url "https://updates.bravesoftware.com/sparkle/Brave-Browser/#{folder}/appcast.xml" - strategy :sparkle, &:short_version - end - - auto_updates true - depends_on macos: ">= :high_sierra" - - app "Brave Browser Nightly.app" - - zap trash: [ - "~/Library/Application Support/brave", - "~/Library/Preferences/com.electron.brave.plist", - "~/Library/Saved Application State/com.electron.brave.savedState", - ] -end diff --git a/Casks/google-chrome-beta.rb b/Casks/google-chrome-beta.rb deleted file mode 100644 index de9ba600574383..00000000000000 --- a/Casks/google-chrome-beta.rb +++ /dev/null @@ -1,54 +0,0 @@ -cask "google-chrome-beta" do - version "125.0.6422.14" - sha256 :no_check - - url "https://dl.google.com/chrome/mac/universal/beta/googlechromebeta.dmg" - name "Google Chrome Beta" - desc "Web browser" - homepage "https://www.google.com/chrome/beta/" - - livecheck do - url "https://chromiumdash.appspot.com/fetch_releases?channel=Beta&platform=Mac" - regex(/"version":\s*"v?(\d+(?:\.\d+)+)"/i) - end - - auto_updates true - depends_on macos: ">= :catalina" - - app "Google Chrome Beta.app" - - zap launchctl: [ - "com.google.keystone.agent", - "com.google.keystone.daemon", - ], - trash: [ - "/Library/Caches/com.google.SoftwareUpdate.*", - "/Library/Google/Google Chrome Brand.plist", - "/Library/Google/GoogleSoftwareUpdate", - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.chrome.app.*.sfl*", - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.chrome.sfl*", - "~/Library/Application Support/Google/Chrome Beta", - "~/Library/Caches/com.google.Chrome", - "~/Library/Caches/com.google.Chrome.helper.*", - "~/Library/Caches/com.google.Keystone", - "~/Library/Caches/com.google.Keystone.Agent", - "~/Library/Caches/com.google.SoftwareUpdate", - "~/Library/Caches/Google/Chrome Beta", - "~/Library/Google/Google Chrome Brand.plist", - "~/Library/Google/GoogleSoftwareUpdate", - "~/Library/LaunchAgents/com.google.keystone.agent.plist", - "~/Library/LaunchAgents/com.google.keystone.xpcservice.plist", - "~/Library/Logs/GoogleSoftwareUpdateAgent.log", - "~/Library/Preferences/com.google.Chrome.plist", - "~/Library/Preferences/com.google.Keystone.Agent.plist", - "~/Library/Saved Application State/com.google.Chrome.app.*.savedState", - "~/Library/Saved Application State/com.google.Chrome.savedState", - "~/Library/WebKit/com.google.Chrome", - ], - rmdir: [ - "/Library/Google", - "~/Library/Application Support/Google", - "~/Library/Caches/Google", - "~/Library/Google", - ] -end diff --git a/Casks/google-chrome-canary.rb b/Casks/google-chrome-canary.rb deleted file mode 100644 index b8932f7ac3a3a9..00000000000000 --- a/Casks/google-chrome-canary.rb +++ /dev/null @@ -1,54 +0,0 @@ -cask "google-chrome-canary" do - version :latest - sha256 :no_check - - url "https://dl.google.com/chrome/mac/universal/canary/googlechromecanary.dmg" - name "Google Chrome Canary" - desc "Web browser" - homepage "https://www.google.com/chrome/canary/" - - # Canary releases are frequent, so we use version :latest. - # livecheck do - # url "https://chromiumdash.appspot.com/fetch_releases?channel=Canary&platform=Mac" - # regex(/"version":\s*"v?(\d+(?:\.\d+)+)"/i) - # end - - depends_on macos: ">= :catalina" - - app "Google Chrome Canary.app" - - zap launchctl: [ - "com.google.keystone.agent", - "com.google.keystone.daemon", - ], - trash: [ - "/Library/Caches/com.google.SoftwareUpdate.*", - "/Library/Google/Google Chrome Brand.plist", - "/Library/Google/GoogleSoftwareUpdate", - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.chrome.app.*.sfl*", - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.chrome.sfl*", - "~/Library/Application Support/Google/Chrome Canary", - "~/Library/Caches/com.google.Chrome", - "~/Library/Caches/com.google.Chrome.helper.*", - "~/Library/Caches/com.google.Keystone", - "~/Library/Caches/com.google.Keystone.Agent", - "~/Library/Caches/com.google.SoftwareUpdate", - "~/Library/Caches/Google/Chrome Canary", - "~/Library/Google/Google Chrome Brand.plist", - "~/Library/Google/GoogleSoftwareUpdate", - "~/Library/LaunchAgents/com.google.keystone.agent.plist", - "~/Library/LaunchAgents/com.google.keystone.xpcservice.plist", - "~/Library/Logs/GoogleSoftwareUpdateAgent.log", - "~/Library/Preferences/com.google.Chrome.plist", - "~/Library/Preferences/com.google.Keystone.Agent.plist", - "~/Library/Saved Application State/com.google.Chrome.app.*.savedState", - "~/Library/Saved Application State/com.google.Chrome.savedState", - "~/Library/WebKit/com.google.Chrome", - ], - rmdir: [ - "/Library/Google", - "~/Library/Application Support/Google", - "~/Library/Caches/Google", - "~/Library/Google", - ] -end diff --git a/Casks/google-chrome-dev.rb b/Casks/google-chrome-dev.rb deleted file mode 100644 index e1044aba2c871f..00000000000000 --- a/Casks/google-chrome-dev.rb +++ /dev/null @@ -1,54 +0,0 @@ -cask "google-chrome-dev" do - version "126.0.6439.0" - sha256 :no_check - - url "https://dl.google.com/chrome/mac/universal/dev/googlechromedev.dmg" - name "Google Chrome Dev" - desc "Web browser" - homepage "https://www.google.com/chrome/dev/" - - livecheck do - url "https://chromiumdash.appspot.com/fetch_releases?channel=Dev&platform=Mac" - regex(/"version":\s*"v?(\d+(?:\.\d+)+)"/i) - end - - auto_updates true - depends_on macos: ">= :catalina" - - app "Google Chrome Dev.app" - - zap launchctl: [ - "com.google.keystone.agent", - "com.google.keystone.daemon", - ], - trash: [ - "/Library/Caches/com.google.SoftwareUpdate.*", - "/Library/Google/Google Chrome Brand.plist", - "/Library/Google/GoogleSoftwareUpdate", - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.chrome.app.*.sfl*", - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.chrome.sfl*", - "~/Library/Application Support/Google/Chrome Dev", - "~/Library/Caches/com.google.Chrome", - "~/Library/Caches/com.google.Chrome.helper.*", - "~/Library/Caches/com.google.Keystone", - "~/Library/Caches/com.google.Keystone.Agent", - "~/Library/Caches/com.google.SoftwareUpdate", - "~/Library/Caches/Google/Chrome Dev", - "~/Library/Google/Google Chrome Brand.plist", - "~/Library/Google/GoogleSoftwareUpdate", - "~/Library/LaunchAgents/com.google.keystone.agent.plist", - "~/Library/LaunchAgents/com.google.keystone.xpcservice.plist", - "~/Library/Logs/GoogleSoftwareUpdateAgent.log", - "~/Library/Preferences/com.google.Chrome.plist", - "~/Library/Preferences/com.google.Keystone.Agent.plist", - "~/Library/Saved Application State/com.google.Chrome.app.*.savedState", - "~/Library/Saved Application State/com.google.Chrome.savedState", - "~/Library/WebKit/com.google.Chrome", - ], - rmdir: [ - "/Library/Google", - "~/Library/Application Support/Google", - "~/Library/Caches/Google", - "~/Library/Google", - ] -end diff --git a/Casks/microsoft-edge-beta.rb b/Casks/microsoft-edge-beta.rb deleted file mode 100644 index 44d838c96ccda3..00000000000000 --- a/Casks/microsoft-edge-beta.rb +++ /dev/null @@ -1,51 +0,0 @@ -cask "microsoft-edge-beta" do - linkid = on_arch_conditional arm: "2099618", intel: "2069439" - - on_arm do - version "124.0.2478.67,9dd7d673-e9a5-4fc7-82de-2a2e38333d35" - sha256 "df8b825f3b4adcbaaaf7e3745f9f3235018c4eac8bf329916e88700f5ffd5dcf" - end - on_intel do - version "124.0.2478.67,fa2b3d5b-6fed-4473-8bce-34f5b1cd5688" - sha256 "a2279f46cde1ed36f3c4128c41e2843a9bb0258748ede7ad8b82fd8da4e14fc6" - end - - url "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/#{version.csv.second}/MicrosoftEdgeBeta-#{version.csv.first}.pkg" - name "Microsoft Edge Beta" - desc "Multi-platform web browser" - homepage "https://www.microsoft.com/en-us/edge/download/insider?form=" - - livecheck do - url "https://go.microsoft.com/fwlink/?linkid=#{linkid}" - regex(%r{/([^/]+)/MicrosoftEdgeBeta[._-]v?(\d+(?:\.\d+)+)\.pkg}i) - strategy :header_match do |headers, regex| - headers["location"].scan(regex).map { |match| "#{match[1]},#{match[0]}" } - end - end - - auto_updates true - - pkg "MicrosoftEdgeBeta-#{version.csv.first}.pkg", - choices: [ - { - "choiceIdentifier" => "com.microsoft.package.Microsoft_AutoUpdate.app", # Office16_all_autoupdate.pkg - "choiceAttribute" => "selected", - "attributeSetting" => 0, - }, - ] - - uninstall launchctl: [ - "com.microsoft.EdgeUpdater.update-internal.109.0.1518.89.system", - "com.microsoft.EdgeUpdater.update.system", - "com.microsoft.EdgeUpdater.wake.109.0.1518.89.system", - "com.microsoft.EdgeUpdater.wake.system", - ], - pkgutil: "com.microsoft.edgemac.Beta" - - zap trash: [ - "~/Library/Application Support/Microsoft Edge Beta", - "~/Library/Caches/Microsoft Edge Beta", - "~/Library/Preferences/com.microsoft.edgemac.Beta.plist", - "~/Library/Saved Application State/com.microsoft.edgemac.Beta.savedState", - ] -end diff --git a/Casks/microsoft-edge-dev.rb b/Casks/microsoft-edge-dev.rb deleted file mode 100644 index d446caf3d60175..00000000000000 --- a/Casks/microsoft-edge-dev.rb +++ /dev/null @@ -1,51 +0,0 @@ -cask "microsoft-edge-dev" do - linkid = on_arch_conditional arm: "2099619", intel: "2069340" - - on_arm do - version "125.0.2535.6,dee68e88-1ed2-4f37-9d5c-b1ed6474272a" - sha256 "91c2d7e743279ead53ae7578e75cc1a82ea5865503ec066b5f5389858d69fe13" - end - on_intel do - version "125.0.2535.6,bb064c6f-3b92-4f58-ad52-58831e23bcd2" - sha256 "03d776505b33a5b2b669772008a363b4f08497e651bd30c4da73c7206f2bc30b" - end - - url "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/#{version.csv.second}/MicrosoftEdgeDev-#{version.csv.first}.pkg" - name "Microsoft Edge Dev" - desc "Multi-platform web browser" - homepage "https://www.microsoft.com/en-us/edge/download/insider?form=" - - livecheck do - url "https://go.microsoft.com/fwlink/?linkid=#{linkid}" - regex(%r{/([^/]+)/MicrosoftEdgeDev[._-]v?(\d+(?:\.\d+)+)\.pkg}i) - strategy :header_match do |headers, regex| - headers["location"].scan(regex).map { |match| "#{match[1]},#{match[0]}" } - end - end - - auto_updates true - - pkg "MicrosoftEdgeDev-#{version.csv.first}.pkg", - choices: [ - { - "choiceIdentifier" => "com.microsoft.package.Microsoft_AutoUpdate.app", # Office16_all_autoupdate.pkg - "choiceAttribute" => "selected", - "attributeSetting" => 0, - }, - ] - - uninstall launchctl: [ - "com.microsoft.EdgeUpdater.update-internal.109.0.1518.89.system", - "com.microsoft.EdgeUpdater.update.system", - "com.microsoft.EdgeUpdater.wake.109.0.1518.89.system", - "com.microsoft.EdgeUpdater.wake.system", - ], - pkgutil: "com.microsoft.edgemac.Dev" - - zap trash: [ - "~/Library/Application Support/Microsoft Edge Dev", - "~/Library/Caches/Microsoft Edge Dev", - "~/Library/Preferences/com.microsoft.edgemac.Dev.plist", - "~/Library/Saved Application State/com.microsoft.edgemac.Dev.savedState", - ] -end diff --git a/tap_migrations.json b/tap_migrations.json index 6fe7aaa8aa1fdc..e2b6629fe7e90d 100644 --- a/tap_migrations.json +++ b/tap_migrations.json @@ -1,4 +1,12 @@ { + "brave-browser-beta": "homebrew/cask/brave-browser@beta", + "brave-browser-dev": "homebrew/cask/brave-browser@dev", + "brave-browser-nightly": "homebrew/cask/brave-browser@nightly", "figma-beta": "homebrew/cask/figma@beta", - "java11": "homebrew/core" + "google-chrome-beta": "homebrew/cask/google-chrome@beta", + "google-chrome-canary": "homebrew/cask/google-chrome@canary", + "google-chrome-dev": "homebrew/cask/google-chrome@dev", + "java11": "homebrew/core", + "microsoft-edge-beta": "homebrew/cask/microsoft-edge@beta", + "microsoft-edge-dev": "homebrew/cask/microsoft-edge@dev" }