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.

Wait for Homebrew before offering Remove Peel to its own copy

Țugui Dragoș8c6db718388d
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 48215f14..affd7798 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -124187,6 +124187,112 @@
}
}
},
+ "Peel waits for Homebrew to say whether it installed this copy, since a copy Homebrew installed is removed with Homebrew." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel čeká, až Homebrew řekne, zda tuto kopii nainstaloval, protože kopie nainstalovaná přes Homebrew se odstraňuje pomocí Homebrew."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel wartet darauf, dass Homebrew mitteilt, ob es diese Kopie installiert hat, da eine von Homebrew installierte Kopie mit Homebrew entfernt wird."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel espera a que Homebrew diga si instaló esta copia, ya que una copia instalada con Homebrew se elimina con Homebrew."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel attend que Homebrew indique s’il a installé cette copie, car une copie installée par Homebrew se supprime avec Homebrew."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel attende che Homebrew dica se ha installato questa copia, perché una copia installata da Homebrew si rimuove con Homebrew."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrewでインストールされたコピーは、Homebrewでアンインストールします。そのため、PeelはこのコピーがHomebrewでインストールされたものかどうか、Homebrewからの応答を待っています。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew가 설치한 복사본은 Homebrew로 제거하므로, Peel은 Homebrew가 이 복사본을 설치했는지 알려 줄 때까지 기다립니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel wacht tot Homebrew meldt of het deze kopie heeft geïnstalleerd, omdat een kopie die Homebrew heeft geïnstalleerd, met Homebrew wordt verwijderd."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel czeka, aż Homebrew poda, czy to on zainstalował tę kopię, ponieważ kopię zainstalowaną przez Homebrew odinstalowuje się za pomocą Homebrew."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Peel espera o Homebrew dizer se instalou esta cópia, já que uma cópia instalada pelo Homebrew é removida com o Homebrew."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel așteaptă ca Homebrew să spună dacă a instalat această copie, deoarece o copie instalată de Homebrew se elimină cu Homebrew."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel ждет, пока Homebrew сообщит, устанавливал ли он эту копию, поскольку копию, установленную Homebrew, удаляют с помощью Homebrew."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel väntar på att Homebrew ska svara om det har installerat den här kopian, eftersom en kopia som Homebrew har installerat tas bort med Homebrew."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel, Homebrew’un bu kopyayı yükleyip yüklemediğini söylemesini bekliyor, çünkü Homebrew’un yüklediği bir kopya Homebrew ile kaldırılır."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel чекає, доки Homebrew повідомить, чи інсталював він цю копію, бо копію, яку інсталював Homebrew, вилучають через Homebrew."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel正在等待Homebrew说明此副本是否由它安装,因为由Homebrew安装的副本需要使用Homebrew移除。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Peel正在等待Homebrew說明這份副本是否由它安裝,因為由Homebrew安裝的副本要使用Homebrew移除。"
+ }
+ }
+ }
+ },
"Peel won’t move itself from here: its folder needs an administrator. Drag it to the Trash in Finder, which asks for an administrator." : {
"localizations" : {
"cs" : {
diff --git a/Peel/Model/SelfUninstall.swift b/Peel/Model/SelfUninstall.swift
index 6e8590a9..768419cb 100644
--- a/Peel/Model/SelfUninstall.swift
+++ b/Peel/Model/SelfUninstall.swift
@@ -15,6 +15,20 @@ final class SelfUninstall {
/// main bundle still names the place Peel left. Nil reads them from the main bundle.
private(set) var words: Bundle?
+ /// How this copy of Peel is removed: with Homebrew's command when Homebrew installed it, which it goes on listing
+ /// otherwise, or with Remove Peel.
+ enum Way: Equatable {
+ case homebrew(String)
+ case removePeel
+ /// Homebrew hasn't said yet whether it installed this copy, which would then look like any other.
+ case waitingForHomebrew
+ }
+
+ static func way(cask: HomebrewPackage?, homebrewKnowsItsApps: Bool) -> Way {
+ if let cask { return .homebrew("brew uninstall --zap --cask \(cask.name)") }
+ return homebrewKnowsItsApps ? .removePeel : .waitingForHomebrew
+ }
+
static var removeCommand: String {
"sudo rm -f /usr/local/bin/peel"
}
diff --git a/Peel/Views/Settings/SettingsView.swift b/Peel/Views/Settings/SettingsView.swift
index 9b4dc88a..3d18ce8d 100644
--- a/Peel/Views/Settings/SettingsView.swift
+++ b/Peel/Views/Settings/SettingsView.swift
@@ -388,9 +388,8 @@ private struct GeneralSettingsView: View {
SavedSettingsSection()
Section {
- // Homebrew lists the copy it installed until `brew uninstall` removes it.
- if let cask = ownCask {
- let command = "brew uninstall --zap --cask \(cask.name)"
+ let way = SelfUninstall.way(cask: ownCask, homebrewKnowsItsApps: homebrew.knowsItsOwnApps)
+ if case .homebrew(let command) = way {
LabeledContent {
CopyButton(text: command)
} label: {
@@ -413,12 +412,10 @@ private struct GeneralSettingsView: View {
}
.buttonStyle(.borderedProminent)
.tint(.red)
- // Disabled until the app list and Homebrew's have loaded: without the first, a file Peel
- // shares with another app would look like Peel's alone, and without the second, a copy
- // Homebrew installed would look like one it didn't.
+ // Disabled until the app list has loaded: a file Peel shares with another app would look like
+ // Peel's alone.
.disabled(
- selfUninstall.isRunning || !library.hasLoaded
- || (homebrew.isInstalled && homebrew.packages == nil)
+ selfUninstall.isRunning || !library.hasLoaded || way == .waitingForHomebrew
|| !history.mayMove || Self.runsFromAReadOnlyCopy
)
}
@@ -438,6 +435,10 @@ private struct GeneralSettingsView: View {
Text(SelfUninstall.explanation(of: .readOnlyCopy))
.font(.callout)
.foregroundStyle(.secondary)
+ } else if way == .waitingForHomebrew {
+ Text("Peel waits for Homebrew to say whether it installed this copy, since a copy Homebrew installed is removed with Homebrew.")
+ .font(.callout)
+ .foregroundStyle(.secondary)
}
}
// Homebrew removes the links its cask made, and no other.
diff --git a/PeelTests/SelfUninstallWayTests.swift b/PeelTests/SelfUninstallWayTests.swift
new file mode 100644
index 00000000..84c6d8b0
--- /dev/null
+++ b/PeelTests/SelfUninstallWayTests.swift
@@ -0,0 +1,15 @@
+import Foundation
+@testable import Peel
+@testable import PeelCore
+import Testing
+
+@MainActor
+struct SelfUninstallWayTests {
+ @Test func waitsForHomebrewToSayWhetherItInstalledThisCopy() {
+ let cask = HomebrewPackage(name: "peel", kind: .cask, installedVersion: "1.2.1")
+
+ #expect(SelfUninstall.way(cask: nil, homebrewKnowsItsApps: false) == .waitingForHomebrew)
+ #expect(SelfUninstall.way(cask: nil, homebrewKnowsItsApps: true) == .removePeel)
+ #expect(SelfUninstall.way(cask: cask, homebrewKnowsItsApps: false) == .homebrew("brew uninstall --zap --cask peel"))
+ }
+}