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.

Name the person's Homebrew settings folder as bin/brew does

Țugui Dragoș25eede671c5b
diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
index 427bf3d3..a0a1776a 100644
--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
@@ -644,10 +644,10 @@ public enum Homebrew {
}
/// The folder of the person's own `brew.env` as `bin/brew` names it for Peel, which passes no `XDG_CONFIG_HOME`:
- /// from a `HOMEBREW_XDG_CONFIG_HOME` the system's or the prefix's file sets, else `~/.homebrew`.
+ /// from a `HOMEBREW_XDG_CONFIG_HOME` the system's or the prefix's file sets, taken as written, else `~/.homebrew`.
static func userConfiguration(home: URL, system: URL, prefix: URL) -> URL {
let files = [system, prefix.appending(path: "etc/homebrew/brew.env")]
- guard let folder = setting("HOMEBREW_XDG_CONFIG_HOME", in: files), folder.hasPrefix("/") else {
+ guard let folder = setting("HOMEBREW_XDG_CONFIG_HOME", in: files), !folder.isEmpty else {
return home.appending(path: ".homebrew", directoryHint: .isDirectory)
}
return URL(filePath: folder, directoryHint: .isDirectory).appending(path: "homebrew", directoryHint: .isDirectory)
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
index dcca468e..4b01bf08 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
@@ -1012,6 +1012,11 @@ struct HomebrewTests {
try folder.file("prefix/etc/homebrew/brew.env", contents: Data("HOMEBREW_XDG_CONFIG_HOME=/srv/settings\n".utf8))
#expect(Homebrew.userConfiguration(home: home, system: system, prefix: prefix).path(percentEncoded: false)
== "/srv/settings/homebrew/")
+ try folder.file("prefix/etc/homebrew/brew.env", contents: Data("HOMEBREW_XDG_CONFIG_HOME=\"/srv/settings\"\n".utf8))
+ let workingFolder = URL(filePath: FileManager.default.currentDirectoryPath, directoryHint: .isDirectory)
+ #expect(Homebrew.userConfiguration(home: home, system: system, prefix: prefix).path(percentEncoded: false)
+ == workingFolder.appending(path: "\"/srv/settings\"/homebrew/").path(percentEncoded: false),
+ "bin/brew takes the value as written, quotes included, from the folder it runs in")
}
/// With `HOMEBREW_NO_INSTALL_FROM_API`, Homebrew reads its taps and never the API files, so its taps are the