Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Repairing the helper tells why it failed
Țugui Dragoșe69035616871
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swift b/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swiftindex 14ce1253..3f3d5a44 100644--- a/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swift+++ b/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swift@@ -38,8 +38,27 @@ public enum PrivilegedHelper {/// Unregisters the helper and registers it again. `SMAppService` refuses to register a service that is/// already registered, so a helper left by an older version of Peel can only be replaced this way.public static func repair() async throws {- try? await service.unregister()- try service.register()+ var unregistering: (any Error)?+ do {+ try await service.unregister()+ } catch {+ unregistering = error+ }+ do {+ try service.register()+ } catch {+ throw repairFailure(registering: error, afterUnregistering: unregistering)+ }+ }++ /// Why a repair failed. A helper that could not be unregistered is still registered, and registering it again+ /// only answers `kSMErrorAlreadyRegistered`, so the reason is what unregistering answered.+ static func repairFailure(registering: any Error, afterUnregistering unregistering: (any Error)?) -> any Error {+ let failure = registering as NSError+ guard let unregistering, failure.domain == SMAppServiceErrorDomain,+ failure.code == Int(kSMErrorAlreadyRegistered)+ else { return registering }+ return unregistering}/// True when this account is an administrator. The helper's Mach service can be reached from every accountdiff --git a/Packages/PeelCore/Tests/PeelCoreTests/HelperRepairTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HelperRepairTests.swiftnew file mode 100644index 00000000..a0366126--- /dev/null+++ b/Packages/PeelCore/Tests/PeelCoreTests/HelperRepairTests.swift@@ -0,0 +1,24 @@+import Foundation+@testable import PeelCore+import ServiceManagement+import Testing++struct HelperRepairTests {+ private let alreadyRegistered = NSError(domain: SMAppServiceErrorDomain, code: Int(kSMErrorAlreadyRegistered))+ private let notAuthorized = NSError(domain: SMAppServiceErrorDomain, code: Int(kSMErrorAuthorizationFailure))+ private let notFound = NSError(domain: SMAppServiceErrorDomain, code: Int(kSMErrorJobNotFound))++ /// A helper that could not be unregistered is still registered, so registering it again only says so: the reason+ /// the repair failed is what unregistering answered.+ @Test func aRepairThatCouldNotUnregisterTellsWhy() {+ let reason = PrivilegedHelper.repairFailure(registering: alreadyRegistered, afterUnregistering: notAuthorized)+ #expect((reason as NSError).code == Int(kSMErrorAuthorizationFailure))+ }++ @Test func anyOtherFailureToRegisterIsItsOwnReason() {+ let reason = PrivilegedHelper.repairFailure(registering: notAuthorized, afterUnregistering: notFound)+ #expect((reason as NSError).code == Int(kSMErrorAuthorizationFailure))+ let alone = PrivilegedHelper.repairFailure(registering: alreadyRegistered, afterUnregistering: nil)+ #expect((alone as NSError).code == Int(kSMErrorAlreadyRegistered))+ }+}