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 Git again once the one Peel knew has gone

Țugui Dragoș0e818fb40542
diff --git a/Peel/Model/GitLibrary.swift b/Peel/Model/GitLibrary.swift
index 8794a1df..faf120e0 100644
--- a/Peel/Model/GitLibrary.swift
+++ b/Peel/Model/GitLibrary.swift
@@ -24,9 +24,12 @@ final class GitLibrary {
private var waiting: [GitSetting: Int] = [:]
private var changes: Task<Void, Never>?
- init(home: URL = .homeDirectory, defaults: UserDefaults = .standard) {
+ private let finding: () async -> GitConfig?
+
+ init(home: URL = .homeDirectory, defaults: UserDefaults = .standard, finding: (() async -> GitConfig?)? = nil) {
self.home = home
self.defaults = defaults
+ self.finding = finding ?? { await GitConfig.find(home: home) }
ledger = GitLedger(stored: defaults.dictionary(forKey: Self.ledgerKey) ?? [:])
}
@@ -41,7 +44,12 @@ final class GitLibrary {
}
private func read() async {
- let git = if let git { git } else { await GitConfig.find(home: home) }
+ // Xcode can move or its tools go while Peel runs.
+ let git = if let git, FileManager.default.isExecutableFile(atPath: git.executable.path(percentEncoded: false)) {
+ git
+ } else {
+ await finding()
+ }
let settings = await git?.settings()
var known = state?.known
if known == nil {
diff --git a/PeelTests/TerminalLibrariesTests.swift b/PeelTests/TerminalLibrariesTests.swift
index 7417d424..2f7fcaaf 100644
--- a/PeelTests/TerminalLibrariesTests.swift
+++ b/PeelTests/TerminalLibrariesTests.swift
@@ -241,6 +241,27 @@ struct TerminalLibrariesTests {
#expect(TerminalToolLibrary.availability(of: .fzfTab, in: .notAsked) == .available)
}
+ @Test func aGitThatWentAwayIsLookedForAgain() async throws {
+ let home = try madeUpHome()
+ defer { try? FileManager.default.removeItem(at: home) }
+ let made = try MadeUpDefaults()
+ defer { made.forget() }
+ let git = home.appending(path: "git")
+ try Data("#!/bin/sh\nexit 1\n".utf8).write(to: git)
+ try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: git.path(percentEncoded: false))
+ let found = GitConfig(executable: git, home: home)
+ let library = GitLibrary(home: home, defaults: made.defaults, finding: {
+ FileManager.default.isExecutableFile(atPath: git.path(percentEncoded: false)) ? found : nil
+ })
+ await library.refresh()
+ #expect(library.state?.isInstalled == true)
+
+ try FileManager.default.removeItem(at: git)
+ await library.refresh()
+
+ #expect(library.state?.isInstalled == false)
+ }
+
@Test func aGitChangeSavesTheLedgerInTheStoreItWasGiven() async throws {
let home = try madeUpHome()
defer { try? FileManager.default.removeItem(at: home) }