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.

Say Homebrew skips a settings file only when it does

Țugui Dragoș698868cfec16
diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
index 7511a3c8..c7a01340 100644
--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
@@ -678,8 +678,17 @@ public enum Homebrew {
}
/// A settings file `bin/brew` reads from a shell that sets `XDG_CONFIG_HOME` to `~/.config`, and not when Peel runs
- /// it, since Peel runs it without the shell's settings and Homebrew then reads `~/.homebrew/brew.env`.
- public static func unreadSettingsFile(home: URL = .homeDirectory) -> URL? {
+ /// it, since Peel runs it without the shell's settings and Homebrew then reads `~/.homebrew/brew.env`. Nil when
+ /// Homebrew's own files name another folder for the person's settings.
+ public static func unreadSettingsFile(prefix: URL) -> URL? {
+ unreadSettingsFile(home: .homeDirectory, system: systemSettingsFile, prefix: prefix)
+ }
+
+ static func unreadSettingsFile(home: URL, system: URL, prefix: URL) -> URL? {
+ let read = userConfiguration(home: home, system: system, prefix: prefix).path(percentEncoded: false)
+ guard read == home.appending(path: ".homebrew", directoryHint: .isDirectory).path(percentEncoded: false) else {
+ return nil
+ }
let file = home.appending(path: ".config/homebrew/brew.env")
var isFolder: ObjCBool = false
let isThere = FileManager.default.fileExists(atPath: file.path(percentEncoded: false), isDirectory: &isFolder)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
index 0c1eee04..87a08fd2 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
@@ -176,15 +176,21 @@ struct HomebrewTests {
}
@Test func namesASettingsFileHomebrewRunFromPeelDoesNotRead() throws {
+ let settings = try TemporaryDirectory()
+ let system = settings.url.appending(path: "etc/homebrew/brew.env")
+ let prefix = settings.url.appending(path: "prefix", directoryHint: .isDirectory)
+ let unread = { (home: URL) in Homebrew.unreadSettingsFile(home: home, system: system, prefix: prefix) }
let home = try TemporaryDirectory()
- #expect(Homebrew.unreadSettingsFile(home: home.url) == nil)
+ #expect(unread(home.url) == nil)
try home.directory(".config/homebrew/brew.env")
- #expect(Homebrew.unreadSettingsFile(home: home.url) == nil, "a folder is no settings file")
+ #expect(unread(home.url) == nil, "a folder is no settings file")
let other = try TemporaryDirectory()
let file = try other.file(".config/homebrew/brew.env", contents: Data("https_proxy=http://proxy.example:8080\n".utf8))
- let unread = Homebrew.unreadSettingsFile(home: other.url)
- #expect(unread?.path(percentEncoded: false) == file.path(percentEncoded: false))
+ #expect(unread(other.url)?.path(percentEncoded: false) == file.path(percentEncoded: false))
+ let config = other.url.appending(path: ".config", directoryHint: .isDirectory).path(percentEncoded: false)
+ try settings.file("prefix/etc/homebrew/brew.env", contents: Data("HOMEBREW_XDG_CONFIG_HOME=\(config)\n".utf8))
+ #expect(unread(other.url) == nil, "Homebrew's own settings send it to that file")
}
@Test func datesTheLastCheckByTheDefinitionsHomebrewReadsFromItsAPI() throws {
diff --git a/Peel/Model/HomebrewLibrary.swift b/Peel/Model/HomebrewLibrary.swift
index 2873d103..4e9af50d 100644
--- a/Peel/Model/HomebrewLibrary.swift
+++ b/Peel/Model/HomebrewLibrary.swift
@@ -77,8 +77,9 @@ final class HomebrewLibrary {
/// What Homebrew's own settings undo of how Peel runs it, or change of what it tells Peel, read with the packages
/// and again before an upgrade.
private(set) var overrides: Homebrew.Overrides = []
- /// A `brew.env` the person keeps where Homebrew run from Peel doesn't look (`Homebrew.unreadSettingsFile()`).
- private(set) var unreadSettingsFile = Homebrew.unreadSettingsFile()
+ /// A `brew.env` the person keeps where Homebrew run from Peel doesn't look, read with the packages
+ /// (`Homebrew.unreadSettingsFile(prefix:)`).
+ private(set) var unreadSettingsFile: URL?
/// Homebrew has no local copy of its package definitions, for example because its cache was cleared (not
/// by Peel: its Developer page leaves them alone). Any question would make Homebrew download them again,
/// at launch and on every change in an Applications folder, which would be Peel contacting the network on
@@ -330,7 +331,7 @@ final class HomebrewLibrary {
autoremovable = preview.autoremoved
}
overrides = overridden ?? overrides
- unreadSettingsFile = Homebrew.unreadSettingsFile()
+ unreadSettingsFile = found.flatMap { Homebrew.unreadSettingsFile(prefix: $0.prefix) }
revision += 1
keepSelectionOnItsPage()
}