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 /usr/local/sbin in the PATH Peel runs Homebrew with

Țugui Dragoș4ae5cd1f26af
diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
index c7a01340..bd600fad 100644
--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift
@@ -1332,7 +1332,8 @@ public enum Homebrew {
autoUpdate: Bool, keeping kept: [String] = [], executable: URL? = nil, readsTheAPI: Bool = true,
home: URL = .homeDirectory, writesLinesAsTheyGo: Bool = true
) -> [String: String] {
- var path = "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ // `bin/brew` keeps this as the person's PATH, so `brew doctor` judges it: `sbin` stands beside `bin` for each.
+ var path = "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin"
// A Homebrew in a prefix of its own finds its own programs first, as the default ones do.
if let executable {
let bin = (executable.path(percentEncoded: false) as NSString).deletingLastPathComponent
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
index 1e18221d..547dc834 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift
@@ -30,6 +30,15 @@ struct HomebrewTests {
)
}
+ @Test func namesSbinBesideBinForEveryPlaceHomebrewInstallsItself() throws {
+ let path = try #require(Homebrew.environment(autoUpdate: false)["PATH"])
+ let folders = path.split(separator: ":").map(String.init)
+ for prefix in Homebrew.usualPrefixes {
+ #expect(folders.contains("/\(prefix)/bin"))
+ #expect(folders.contains("/\(prefix)/sbin"))
+ }
+ }
+
@Test func asksForEachLineAsItGoesExceptOfTheHealthCheck() {
#expect(Homebrew.environment(autoUpdate: false)["CI"] == "1")
// `brew doctor` reads `CI` as a CI run and skips its check of the taps' branches (`diagnostic.rb`).