Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Look for Homebrew's moved cache in the folder its own settings name

Țugui Dragoș729f7edf2024
diff --git a/Packages/PeelCore/Sources/PeelCore/Developer/ToolSettings.swift b/Packages/PeelCore/Sources/PeelCore/Developer/ToolSettings.swift
index 2d2c6284..f08ad9a6 100644
--- a/Packages/PeelCore/Sources/PeelCore/Developer/ToolSettings.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Developer/ToolSettings.swift
@@ -79,8 +79,9 @@ struct ToolSettings: Sendable {
}
/// Every place `HOMEBREW_CACHE` names in the `brew.env` files, for each prefix Homebrew may be in and each folder
- /// the person's own file may be in: `~/.homebrew`, or `~/.config/homebrew` for a shell that sets
- /// `XDG_CONFIG_HOME` there. Homebrew takes the value as written, so only an absolute path names a place.
+ /// the person's own file may be in: `~/.homebrew`, `~/.config/homebrew` for a shell that sets `XDG_CONFIG_HOME`
+ /// there, or the folder Homebrew's own files name. Homebrew takes the value as written, so only an absolute path
+ /// names a place.
private static func homebrewCaches(home: URL, root: URL) -> [URL] {
let chosen = HomebrewChoice(url: HomebrewChoice.url(inHome: home)).load()
.map { $0.deletingLastPathComponent().deletingLastPathComponent() }
@@ -90,7 +91,8 @@ struct ToolSettings: Sendable {
let system = root.appending(path: "etc/homebrew/brew.env")
var caches: [URL] = []
for prefix in prefixes {
- for folder in ownFolders {
+ let named = Homebrew.userConfiguration(home: home, system: system, prefix: prefix)
+ for folder in ownFolders.contains(named) ? ownFolders : ownFolders + [named] {
let files = Homebrew.settingsFiles(system: system, prefix: prefix, userConfiguration: folder)
guard let cache = Homebrew.setting("HOMEBREW_CACHE", in: files).flatMap(absolute),
!caches.contains(cache)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ToolSettingsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ToolSettingsTests.swift
index 0ac7caa3..5f25335e 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/ToolSettingsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/ToolSettingsTests.swift
@@ -194,6 +194,16 @@ struct ToolSettingsTests {
#expect(caches().isEmpty, "a value taken as written names no place")
}
+ @Test func findsHomebrewsCacheInTheSettingsFolderItsOwnFilesName() throws {
+ let directory = try TemporaryDirectory()
+ let home = directory.url.appending(path: "home", directoryHint: .isDirectory)
+ let settings = directory.url.appending(path: "settings", directoryHint: .isDirectory).path(percentEncoded: false)
+ try directory.file("opt/homebrew/etc/homebrew/brew.env", contents: Data("HOMEBREW_XDG_CONFIG_HOME=\(settings)\n".utf8))
+ try directory.file("settings/homebrew/brew.env", contents: Data("HOMEBREW_CACHE=/moved\n".utf8))
+
+ #expect(ToolSettings(home: home, root: directory.url).homebrewCaches.map { Self.path($0) } == ["/moved"])
+ }
+
@Test func spaceLeavesToDeveloperHomebrewsCacheMovedIntoItsCaches() throws {
let directory = try TemporaryDirectory()
let home = directory.url.appending(path: "home", directoryHint: .isDirectory)