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
Leave Peel's own cask to Peel's own updates
Țugui Dragoș8e698ccfdb44
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstringsindex aa191aac..14b70f9f 100644--- a/Localization/Peel/Localizable.xcstrings+++ b/Localization/Peel/Localizable.xcstrings@@ -130341,6 +130341,112 @@}}},+ "Peel updates itself, so it isn’t upgraded from here: Homebrew would have to quit Peel first." : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel se aktualizuje sám, a proto se odtud neupgraduje: Homebrew by musel Peel nejprve ukončit."+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel aktualisiert sich selbst, daher wird hier kein Upgrade für Peel ausgeführt: Homebrew müsste Peel zuerst beenden."+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel se actualiza por sí mismo, así que su paquete no se actualiza desde aquí: Homebrew tendría que cerrar Peel primero."+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel se met à jour lui-même : il n’est donc pas mis à niveau ici, car Homebrew devrait d’abord quitter Peel."+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel si aggiorna da solo, quindi non viene aggiornato da qui: Homebrew dovrebbe prima chiudere Peel."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peelは自身をアップデートするため、ここからはアップグレードされません。アップグレードするには、Homebrewが先にPeelを終了する必要があるためです。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel은 스스로 업데이트하므로 여기에서는 업그레이드되지 않습니다. 여기에서 업그레이드하면 Homebrew가 먼저 Peel을 종료해야 하기 때문입니다."+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel werkt zichzelf bij en wordt hier dus niet geüpgraded: Homebrew zou Peel dan eerst moeten stoppen."+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel uaktualnia się sam, więc nie jest stąd uaktualniany: Homebrew musiałby najpierw zakończyć Peel."+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "O Peel se atualiza sozinho, por isso o upgrade dele não é feito daqui: o Homebrew precisaria encerrar o Peel primeiro."+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel se actualizează singur, așa că nu i se face upgrade de aici: Homebrew ar trebui să închidă mai întâi aplicația Peel."+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel обновляется сам, поэтому Homebrew здесь его не обновляет: ему пришлось бы сначала завершить Peel."+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel uppdaterar sig själv och uppgraderas därför inte härifrån: Homebrew skulle behöva avsluta Peel först."+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel kendini günceller, bu yüzden buradan yükseltilmez: Homebrew’un önce Peel’den çıkması gerekirdi."+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel оновлюється сама, тому звідси її не оновлюють: Homebrew довелося б спершу завершити програму «Peel»."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel会自行更新,因此不在此处升级:Homebrew需要先退出Peel。"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel會自行更新,因此不會從這裡升級:Homebrew必須先結束Peel。"+ }+ }+ }+ },"Peel waits for Homebrew to say whether it installed this copy, since a copy Homebrew installed is removed with Homebrew." : {"localizations" : {"cs" : {diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swift b/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swiftindex 3d9ba3b1..45e18cd9 100644--- a/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swift+++ b/Packages/PeelCore/Sources/PeelCore/Apps/InstalledApp.swift@@ -160,7 +160,7 @@ public struct InstalledApp: Sendable, Hashable, Identifiable {)}- private static let runningBundle = PathPattern.comparablePath(of: Bundle.main.bundleURL)+ static let runningBundle = PathPattern.comparablePath(of: Bundle.main.bundleURL)private static func isPeel(_ bundleIdentifier: String?, at path: String) -> Bool {bundleIdentifier.map(Identifier.isPeels) == true || PathComponents.isPath(runningBundle, inside: path)diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swiftindex 873f7c36..406aeeb1 100644--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift@@ -88,10 +88,20 @@ public struct HomebrewPackage: Sendable, Hashable, Identifiable {}/// Whether Upgrade All takes it along when it is out of date: a pinned package is held at its version on purpose,- /// and a cask whose upgrade needs an administrator is upgraded in Terminal.+ /// a cask whose upgrade needs an administrator is upgraded in Terminal, and Peel's own updates itself.public var joinsUpgradeAll: Bool {isStillUpgraded && !isPinned && !upgradeNeedsAnAdministrator && !isMissingWhatItInstalled- && !isStoppedMidUpgrade+ && !isStoppedMidUpgrade && !isPeelItself+ }++ /// True for Peel's own cask: its definition quits Peel or one of its parts, or the code that runs is in one of its+ /// apps. Peel never runs Homebrew on it, since Homebrew would have to quit Peel first.+ public var isPeelItself: Bool {+ quitIdentifiers.contains(where: Identifier.isPeels)+ || appTargets.contains { target in+ let app = PathPattern.comparablePath(of: URL(filePath: target, directoryHint: .isDirectory))+ return PathComponents.isPath(InstalledApp.runningBundle, atOrInside: app)+ }}/// Whether Homebrew offers a newer version that it can install. It upgrades a cask's app where it put it, so itdiff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swiftindex 3bc8ad42..e1ceb2c3 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift@@ -68,6 +68,24 @@ struct HomebrewTests {#expect(UpdateChecker.homebrewStatus(of: package(.disabled), appVersion: "1.0", at: .now) == nil)}+ @Test func peelsOwnCaskIsLeftToPeelsOwnUpdates() {+ func cask(quitting identifiers: [String] = [], apps: [String] = []) -> HomebrewPackage {+ HomebrewPackage(+ name: "peel", kind: .cask, installedVersion: "1.0", latestVersion: "2.0", isOutdated: true,+ appTargets: apps, quitIdentifiers: identifiers+ )+ }+ let peels = cask(quitting: ["com.tuguidragos.Peel"])+ let running = cask(apps: [Bundle.main.bundleURL.path(percentEncoded: false)])+ let other = cask(quitting: ["org.example.app"], apps: ["/Applications/Example.app"])++ #expect(peels.isPeelItself && running.isPeelItself && !other.isPeelItself)+ #expect(peels.waitsForAnUpgrade)+ #expect(!peels.joinsUpgradeAll, "Upgrade All would have Peel quit itself first")+ #expect(!running.joinsUpgradeAll)+ #expect(other.joinsUpgradeAll)+ }+@Test func knowsWhenSudoAskedForAPassword() {let sudo = """==> Running installer for zoom with sudo; the password may be necessary.diff --git a/Peel/Views/Homebrew/HomebrewDetailView.swift b/Peel/Views/Homebrew/HomebrewDetailView.swiftindex ebf14356..c4db533a 100644--- a/Peel/Views/Homebrew/HomebrewDetailView.swift+++ b/Peel/Views/Homebrew/HomebrewDetailView.swift@@ -6,6 +6,7 @@ struct HomebrewDetailView: View {@Environment(AppLibrary.self) private var library@Environment(ExclusionsStore.self) private var exclusions@Environment(RemovalHistoryStore.self) private var history+ @Environment(PeelUpdater.self) private var updater@State private var isConfirmingUninstall = false@State private var isConfirmingUpgrade = false@State private var quittingToUpgrade = QuitBeforeRemoving()@@ -133,7 +134,13 @@ struct HomebrewDetailView: View {.disabled(!history.mayMove).help(Text(verbatim: history.holdingReason?.explanation ?? ""))} else if package.waitsForAnUpgrade {- if package.upgradeNeedsAnAdministrator || homebrew.overrides.contains(.cleansUp) {+ if package.isPeelItself {+ Button("Check for Updates…", systemImage: "arrow.down.circle") {+ updater.checkForUpdates()+ }+ .buttonStyle(.borderedProminent)+ .disabled(!updater.canCheckForUpdates)+ } else if package.upgradeNeedsAnAdministrator || homebrew.overrides.contains(.cleansUp) {let kind = package.kind == .cask ? "--cask" : "--formula"CopyButton(text: Homebrew.terminalCommand(@@ -178,12 +185,17 @@ struct HomebrewDetailView: View {homebrew.runningCommand != nil || homebrew.isForgetting || quittingToUpgrade.isWaiting|| quittingToUninstall.isWaiting)- if package.waitsForAnUpgrade, homebrew.overrides.contains(.cleansUp) {+ if package.waitsForAnUpgrade, package.isPeelItself {+ Text("Peel updates itself, so it isn’t upgraded from here: Homebrew would have to quit Peel first.")+ .font(.callout)+ .foregroundStyle(.secondary)+ } else if package.waitsForAnUpgrade, homebrew.overrides.contains(.cleansUp) {Text(HomebrewLibrary.cleansUp).font(.callout).foregroundStyle(.secondary)}- if (package.waitsForAnUpgrade && package.upgradeNeedsAnAdministrator) || isUninstalledInTerminal {+ if (package.waitsForAnUpgrade && package.upgradeNeedsAnAdministrator && !package.isPeelItself)+ || isUninstalledInTerminal {Text(needsTerminal).font(.callout).foregroundStyle(.secondary)