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.

Tell on a package's page how to remove what only an administrator can move

Țugui Dragoș6dc4b86f6f1c
diff --git a/Packages/PeelCore/Sources/PeelCommandLine/Commands/FileCommands.swift b/Packages/PeelCore/Sources/PeelCommandLine/Commands/FileCommands.swift
index 19cf6fa9..ca5c802c 100644
--- a/Packages/PeelCore/Sources/PeelCommandLine/Commands/FileCommands.swift
+++ b/Packages/PeelCore/Sources/PeelCommandLine/Commands/FileCommands.swift
@@ -165,7 +165,7 @@ struct OrphansCommand: AsyncParsableCommand {
if !scan.forAnAdministrator.isEmpty {
notes.append(byHand)
}
- if scan.forAnAdministrator.contains(where: \.item.isKernelExtension) {
+ if scan.forAnAdministrator.contains(where: \.item.url.isKernelExtension) {
notes.append(kernelExtensions)
}
return notes
diff --git a/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift b/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift
index 47ebac8d..f5754cf8 100644
--- a/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift
@@ -31,12 +31,6 @@ public struct OrphanItem: Sendable, Hashable, Identifiable {
public var id: URL { url }
- /// True for a kernel extension, which macOS takes out of the kernel only when the Mac restarts: since macOS 11,
- /// third-party kernel extensions load as one collection when the Mac starts up.
- public var isKernelExtension: Bool {
- url.pathExtension.caseInsensitiveCompare("kext") == .orderedSame
- }
-
public func isLocked(canUseHelper: Bool) -> Bool {
requiresPrivileges && leftAlone == nil && !canUseHelper
}
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/RealFolder.swift b/Packages/PeelCore/Sources/PeelCore/Support/RealFolder.swift
index da98410a..58d001a8 100644
--- a/Packages/PeelCore/Sources/PeelCore/Support/RealFolder.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Support/RealFolder.swift
@@ -35,6 +35,12 @@ extension URL {
(try? resourceValues(forKeys: [.isUbiquitousItemKey]).isUbiquitousItem) == true
}
+ /// True for a kernel extension, which macOS takes out of the kernel only when the Mac restarts: since macOS 11,
+ /// third-party kernel extensions load as one collection when the Mac starts up.
+ public var isKernelExtension: Bool {
+ pathExtension.caseInsensitiveCompare("kext") == .orderedSame
+ }
+
/// Whether this is a package, such as an app.
var isAPackage: Bool {
(try? resourceValues(forKeys: [.isPackageKey]).isPackage) == true
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
index 5db3b774..77fe2cbf 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
@@ -597,7 +597,7 @@ struct FileCommandTests {
var scan = OrphanScan(groups: [], unreadableLocations: [])
scan.forAnAdministrator = [AdministratorItem(item: other, apps: ["Gone"])]
- #expect(driver.isKernelExtension && !other.isKernelExtension)
+ #expect(driver.url.isKernelExtension && !other.url.isKernelExtension)
#expect(!OrphansCommand.notes(for: scan, ownersUnreadable: false).contains(OrphansCommand.kernelExtensions))
scan.forAnAdministrator.append(AdministratorItem(item: driver, apps: ["Gone"]))
#expect(OrphansCommand.notes(for: scan, ownersUnreadable: false).last == OrphansCommand.kernelExtensions)
diff --git a/Peel/Views/Orphans/AdministratorItemsView.swift b/Peel/Views/Orphans/AdministratorItemsView.swift
index 15f71c0f..03f7c3e2 100644
--- a/Peel/Views/Orphans/AdministratorItemsView.swift
+++ b/Peel/Views/Orphans/AdministratorItemsView.swift
@@ -59,7 +59,7 @@ struct AdministratorItemsView: View {
let apps = entry.apps.formatted(.list(type: .and))
lines.append(String(localized: "Peel isn’t sure only \(apps) used this. Check it before you remove it."))
}
- if entry.item.isKernelExtension {
+ if entry.item.url.isKernelExtension {
lines.append(String(localized: "macOS changes the kernel extensions it loads only when the Mac restarts, so restart once this one is in the Trash."))
}
return lines.joined(separator: "\n\n")
diff --git a/Peel/Views/Packages/PackageDetailView.swift b/Peel/Views/Packages/PackageDetailView.swift
index 4662eccd..1bfbdb37 100644
--- a/Peel/Views/Packages/PackageDetailView.swift
+++ b/Peel/Views/Packages/PackageDetailView.swift
@@ -1,3 +1,4 @@
+import AppKit
import PeelCore
import SwiftUI
@@ -20,6 +21,20 @@ struct PackageDetailView: View {
if !helper.canAct {
HelperRequiredBanner()
}
+ let forAnAdministrator = receipt.items.filter { $0.heldBack == .beyondTheHelper }
+ if !forAnAdministrator.isEmpty {
+ Notice(
+ title: Text("Needs an Administrator"),
+ detail: Text("Only an administrator can move these, and Peel’s helper isn’t allowed to move them from where they are. To remove one, show it in Finder, drag it to the Trash, then enter an administrator name and password when macOS asks."),
+ kind: .note,
+ systemImage: "lock.shield"
+ ) {
+ Button("Show in Finder", systemImage: "folder") {
+ NSWorkspace.shared.activateFileViewerSelecting(forAnAdministrator.map(\.url))
+ }
+ }
+ .listRowSeparator(.hidden)
+ }
Section {
if receipt.items.isEmpty {
@@ -198,7 +213,11 @@ struct PackageDetailView: View {
private func note(for item: PackageReceipt.Item) -> String? {
if let removedElsewhere = item.removedElsewhere { return String(localized: removedElsewhere.explanation) }
- return item.heldBack.map { String(localized: $0.explanation) }
+ guard let heldBack = item.heldBack else { return nil }
+ let why = String(localized: heldBack.explanation)
+ guard heldBack == .beyondTheHelper, item.url.isKernelExtension else { return why }
+ return why + "\n\n"
+ + String(localized: "macOS changes the kernel extensions it loads only when the Mac restarts, so restart once this one is in the Trash.")
}
}