Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Read the same Homebrew settings for its last check as for its definitions
Țugui Dragoș7302ac46aa3c
diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swiftindex a0a1776a..7511a3c8 100644--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift@@ -628,9 +628,7 @@ public enum Homebrew {let repository = await ask(["--repository"]).flatMap(folder(answering:)),let prefix = await ask(["--prefix"]).flatMap(folder(answering:))else { return false }- let system = URL(filePath: "/etc/homebrew/brew.env")- let user = userConfiguration(home: home, system: system, prefix: prefix)- let files = settingsFiles(system: system, prefix: prefix, userConfiguration: user)+ let files = settingsFiles(system: systemSettingsFile, prefix: prefix, home: home)// A tap is installed when its folder is there (`Tap#installed?`).let taps = repository.appending(path: "Library/Taps/homebrew", directoryHint: .isDirectory)let hasCoreTaps = ["homebrew-core", "homebrew-cask"].allSatisfy { tap in@@ -688,6 +686,14 @@ public enum Homebrew {return isThere && !isFolder.boolValue ? file : nil}+ static let systemSettingsFile = URL(filePath: "/etc/homebrew/brew.env")++ /// The `brew.env` files `bin/brew` reads when Peel runs it, with the person's in the folder it names for Peel.+ static func settingsFiles(system: URL, prefix: URL, home: URL) -> [URL] {+ let user = userConfiguration(home: home, system: system, prefix: prefix)+ return settingsFiles(system: system, prefix: prefix, userConfiguration: user)+ }+/// The `brew.env` files `bin/brew` reads before every command, in its order: the system's, the prefix's, the/// user's, and the system's once more when it says it takes priority.static func settingsFiles(system: URL, prefix: URL, userConfiguration: URL) -> [URL] {@@ -751,16 +757,17 @@ public enum Homebrew {/// default, since a fetch of its own code leaves them as they were, else when `.git/FETCH_HEAD` was last touched.@concurrentpublic static func lastUpdateCheck() async -> Date? {- guard let answer = try? await answer(["--repository"]), let repository = folder(answering: answer) else {- return nil- }- guard let executable = executableURL, let cache = (try? await self.answer(["--cache"])).flatMap(folder(answering:))+ await lastUpdateCheck(home: .homeDirectory, system: systemSettingsFile) { try? await answer($0) }+ }++ static func lastUpdateCheck(+ home: URL, system: URL, asking ask: (_ arguments: [String]) async -> String?+ ) async -> Date? {+ guard let repository = await ask(["--repository"]).flatMap(folder(answering:)) else { return nil }+ guard let cache = await ask(["--cache"]).flatMap(folder(answering:)),+ let prefix = await ask(["--prefix"]).flatMap(folder(answering:))else { return lastUpdateCheck(inRepository: repository) }- let files = settingsFiles(- system: URL(filePath: "/etc/homebrew/brew.env"),- prefix: executable.deletingLastPathComponent().deletingLastPathComponent(),- userConfiguration: URL.homeDirectory.appending(path: ".homebrew", directoryHint: .isDirectory)- )+ let files = settingsFiles(system: system, prefix: prefix, home: home)return lastUpdateCheck(inRepository: repository, cache: cache, readsTheTaps: readsTheTaps(settingsIn: files))}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swiftindex 4b01bf08..0c1eee04 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift@@ -214,6 +214,30 @@ struct HomebrewTests {#expect(check(false) == fetched, "a download Homebrew couldn't verify")}+ @Test func datesTheLastCheckByTheSettingsFilesBrewReadsForPeel() async throws {+ let folder = try TemporaryDirectory()+ let fetchHead = try folder.file("repository/.git/FETCH_HEAD", contents: Data("main\n".utf8))+ let packages = try folder.file("cache/api/internal/packages.arm64_tahoe.jws.json", bytes: 64)+ let fetched = Date(timeIntervalSince1970: 1_792_315_250)+ for (when, file) in [(fetched, fetchHead), (fetched.addingTimeInterval(60 * 60), packages)] {+ let path = file.path(percentEncoded: false)+ try FileManager.default.setAttributes([.modificationDate: when], ofItemAtPath: path)+ }+ let settings = folder.url.appending(path: "settings", directoryHint: .isDirectory).path(percentEncoded: false)+ try folder.file("prefix/etc/homebrew/brew.env", contents: Data("HOMEBREW_XDG_CONFIG_HOME=\(settings)\n".utf8))+ try folder.file("settings/homebrew/brew.env", contents: Data("HOMEBREW_NO_INSTALL_FROM_API=1\n".utf8))+ let answers = ["--repository": "repository", "--cache": "cache", "--prefix": "prefix"].mapValues {+ folder.url.appending(path: $0, directoryHint: .isDirectory).path(percentEncoded: false)+ }++ let checked = await Homebrew.lastUpdateCheck(+ home: folder.url.appending(path: "home", directoryHint: .isDirectory),+ system: folder.url.appending(path: "etc/homebrew/brew.env")+ ) { answers[$0.joined(separator: " ")] }++ #expect(checked == fetched, "the person's settings, in the folder the prefix's file names, make it read its taps")+ }+@Test func readsTheLastCheckOfTheHomebrewOnThisMac() async throws {guard Homebrew.executableURL != nil else {#expect(await Homebrew.lastUpdateCheck() == nil)