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.

Say why Remove Peel waits when Homebrew can't answer

Țugui Dragoșe0b70abd2aef
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 08cbaf83..8570bbf1 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -56827,6 +56827,113 @@
}
}
},
+ "Homebrew didn’t say what is installed, so Peel can’t tell whether it installed this copy, which would then be removed with Homebrew." : {
+ "comment" : "Settings, under Remove Peel, beside a button that opens the Homebrew page: Homebrew’s reading failed, so Remove Peel waits. A copy of Peel Homebrew installed is removed with Homebrew’s own command.",
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew neřekl, co je nainstalováno, takže Peel nemůže zjistit, zda tuto kopii nainstaloval Homebrew, a v tom případě by se odstraňovala pomocí Homebrew."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew hat nicht mitgeteilt, was installiert ist, daher kann Peel nicht feststellen, ob Homebrew diese Kopie installiert hat, die dann mit Homebrew entfernt würde."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew no ha indicado qué hay instalado, así que Peel no puede saber si instaló esta copia, que en ese caso se eliminaría con Homebrew."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew n’a pas indiqué ce qui est installé : Peel ne peut donc pas savoir si Homebrew a installé cette copie, qui se supprimerait alors avec Homebrew."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew non ha detto cosa è installato, quindi Peel non può sapere se Homebrew ha installato questa copia, che in quel caso andrebbe rimossa con Homebrew."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrewがインストール済みのものを報告しなかったため、PeelはこのコピーがHomebrewでインストールされたものかどうかを判断できません。Homebrewでインストールされたものであれば、Homebrewでアンインストールすることになります。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew가 설치된 항목을 알려 주지 않았으므로, Peel은 Homebrew가 이 복사본을 설치했는지 알 수 없습니다. Homebrew가 설치했다면 이 복사본은 Homebrew로 제거합니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew heeft niet gemeld wat er is geïnstalleerd, dus Peel kan niet zien of Homebrew deze kopie heeft geïnstalleerd, die dan met Homebrew zou worden verwijderd."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew nie podał, co jest zainstalowane, więc Peel nie może ustalić, czy to Homebrew zainstalował tę kopię, którą należałoby wtedy odinstalować za pomocą Homebrew."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Homebrew não informou o que está instalado, então o Peel não consegue saber se ele instalou esta cópia, que nesse caso seria removida com o Homebrew."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew nu a spus ce este instalat, așa că Peel nu poate ști dacă Homebrew a instalat această copie, caz în care s‑ar elimina cu Homebrew."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew не сообщил, что установлено, поэтому Peel не может определить, установил ли эту копию Homebrew, а такую копию удаляют с помощью Homebrew."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew sa inte vad som är installerat, så Peel kan inte avgöra om det har installerat den här kopian, som i så fall skulle tas bort med Homebrew."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew neyin yüklü olduğunu söylemedi, bu yüzden Peel bu kopyayı Homebrew’un yükleyip yüklemediğini anlayamıyor; Homebrew yüklediyse bu kopya Homebrew ile kaldırılır."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew не повідомив, що інстальовано, тож Peel не може визначити, чи інсталював він цю копію, а таку копію вилучають через Homebrew."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew没有说明安装了哪些内容,因此Peel无法判断此副本是否由它安装;如果是,就需要使用Homebrew移除此副本。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew沒有說明安裝了哪些項目,因此Peel無法判斷這份副本是否由它安裝;若是由它安裝,就要使用Homebrew移除。"
+ }
+ }
+ }
+ },
"Homebrew finished" : {
"localizations" : {
"cs" : {
@@ -57781,6 +57888,113 @@
}
}
},
+ "Homebrew has to update before it can say whether it installed this copy, which would then be removed with Homebrew." : {
+ "comment" : "Settings, under Remove Peel, beside a button that opens the Homebrew page: Homebrew’s own list of packages isn’t on this Mac, so it can’t answer until it updates, and Remove Peel waits.",
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew se musí aktualizovat, než bude moci říct, zda tuto kopii nainstaloval, a v tom případě by se odstraňovala pomocí Homebrew."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew muss aktualisiert werden, bevor es mitteilen kann, ob es diese Kopie installiert hat, die dann mit Homebrew entfernt würde."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew tiene que actualizarse antes de poder decir si instaló esta copia, que en ese caso se eliminaría con Homebrew."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew doit se mettre à jour avant de pouvoir indiquer s’il a installé cette copie, qui se supprimerait alors avec Homebrew."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew deve aggiornarsi prima di poter dire se ha installato questa copia, che in quel caso andrebbe rimossa con Homebrew."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrewは、このコピーをインストールしたかどうかを答える前に、アップデートする必要があります。Homebrewでインストールされたものであれば、Homebrewでアンインストールすることになります。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew가 이 복사본을 설치했는지 알려 주려면 먼저 Homebrew가 업데이트되어야 합니다. Homebrew가 설치했다면 이 복사본은 Homebrew로 제거합니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew moet eerst worden bijgewerkt voordat het kan melden of het deze kopie heeft geïnstalleerd, die dan met Homebrew zou worden verwijderd."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew musi się odświeżyć, zanim będzie mógł podać, czy to on zainstalował tę kopię, którą należałoby wtedy odinstalować za pomocą Homebrew."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Homebrew precisa se atualizar antes de poder dizer se instalou esta cópia, que nesse caso seria removida com o Homebrew."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew trebuie să se actualizeze înainte de a putea spune dacă a instalat această copie, caz în care s‑ar elimina cu Homebrew."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew должен обновиться, прежде чем сможет сообщить, устанавливал ли он эту копию, а такую копию удаляют с помощью Homebrew."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew måste uppdateras innan det kan svara om det har installerat den här kopian, som i så fall skulle tas bort med Homebrew."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew’un bu kopyayı yükleyip yüklemediğini söyleyebilmesi için önce kendini güncellemesi gerekiyor; Homebrew yüklediyse bu kopya Homebrew ile kaldırılır."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew має оновитися, перш ніж зможе повідомити, чи інсталював він цю копію, а таку копію вилучають через Homebrew."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew需要先更新,才能说明此副本是否由它安装;如果是,就需要使用Homebrew移除此副本。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew必須先更新,才能說明這份副本是否由它安裝;若是由它安裝,就要使用Homebrew移除。"
+ }
+ }
+ }
+ },
"Homebrew installed this app and will keep listing it as installed. To take it off that list, run `brew uninstall --cask %@`: Homebrew then carries out the cask’s own uninstall steps, which can delete files for good." : {
"localizations" : {
"cs" : {
diff --git a/Peel/Model/HomebrewLibrary.swift b/Peel/Model/HomebrewLibrary.swift
index 2041b0ac..861d46df 100644
--- a/Peel/Model/HomebrewLibrary.swift
+++ b/Peel/Model/HomebrewLibrary.swift
@@ -104,6 +104,21 @@ final class HomebrewLibrary {
var knowsItsOwnApps: Bool { !isInstalled || hasAnswered }
+ /// Why Homebrew's last reading ended without saying what is installed, as its page says it.
+ enum Unanswered: Equatable {
+ /// Homebrew answered with an error.
+ case readingFailed
+ /// Homebrew has no local list of its packages, and asking would download it again.
+ case hasToUpdate
+ }
+
+ /// Nil while Homebrew hasn't answered yet, and once it has.
+ var unanswered: Unanswered? {
+ guard isInstalled, !hasAnswered else { return nil }
+ if couldNotRead != nil { return .readingFailed }
+ return needsDefinitions ? .hasToUpdate : nil
+ }
+
/// Whether this account may change Homebrew, true until Homebrew has been read. On another account of the Mac its
/// lists can be read, and what changes it is left to the account it belongs to.
var mayChange: Bool { installation?.mayBeChangedByThisAccount ?? true }
diff --git a/Peel/Model/SelfUninstall.swift b/Peel/Model/SelfUninstall.swift
index c5e477ce..caa5054f 100644
--- a/Peel/Model/SelfUninstall.swift
+++ b/Peel/Model/SelfUninstall.swift
@@ -62,11 +62,24 @@ final class SelfUninstall {
case removePeel
/// Homebrew hasn't said yet whether it installed this copy, which would then look like any other.
case waitingForHomebrew
+ /// Homebrew's reading ended without saying, for the reason its page gives.
+ case homebrewDidNotAnswer(HomebrewLibrary.Unanswered)
+
+ /// Whether Remove Peel waits until Homebrew says whether it installed this copy.
+ var waitsForHomebrew: Bool {
+ switch self {
+ case .waitingForHomebrew, .homebrewDidNotAnswer: true
+ case .homebrew, .removePeel: false
+ }
+ }
}
- static func way(cask: HomebrewPackage?, homebrewKnowsItsApps: Bool) -> Way {
+ static func way(
+ cask: HomebrewPackage?, homebrewKnowsItsApps: Bool, unanswered: HomebrewLibrary.Unanswered? = nil
+ ) -> Way {
if let cask { return .homebrew("brew uninstall --zap --cask \(cask.name)") }
- return homebrewKnowsItsApps ? .removePeel : .waitingForHomebrew
+ if homebrewKnowsItsApps { return .removePeel }
+ return unanswered.map(Way.homebrewDidNotAnswer) ?? .waitingForHomebrew
}
/// Whether Peel can't remove itself from this account: its helper is registered, and only an administrator may
diff --git a/Peel/Views/Settings/SettingsView.swift b/Peel/Views/Settings/SettingsView.swift
index c3add46c..fd6e043e 100644
--- a/Peel/Views/Settings/SettingsView.swift
+++ b/Peel/Views/Settings/SettingsView.swift
@@ -413,7 +413,9 @@ private struct GeneralSettingsView: View {
SavedSettingsSection()
Section {
- let way = SelfUninstall.way(cask: ownCask, homebrewKnowsItsApps: homebrew.knowsItsOwnApps)
+ let way = SelfUninstall.way(
+ cask: ownCask, homebrewKnowsItsApps: homebrew.knowsItsOwnApps, unanswered: homebrew.unanswered
+ )
if case .homebrew(let command) = way {
LabeledContent {
CopyButton(text: command)
@@ -440,7 +442,7 @@ private struct GeneralSettingsView: View {
// 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 || way == .waitingForHomebrew
+ selfUninstall.isRunning || !library.hasLoaded || way.waitsForHomebrew
|| !history.mayMove || Self.runsFromAReadOnlyCopy || waitsForAnAdministrator
)
}
@@ -476,6 +478,20 @@ private struct GeneralSettingsView: View {
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)
+ } else if case .homebrewDidNotAnswer(let why) = way {
+ HStack {
+ Group {
+ if why == .readingFailed {
+ Text("Homebrew didn’t say what is installed, so Peel can’t tell whether it installed this copy, which would then be removed with Homebrew.")
+ } else {
+ Text("Homebrew has to update before it can say whether it installed this copy, which would then be removed with Homebrew.")
+ }
+ }
+ .font(.callout)
+ .foregroundStyle(.secondary)
+ Spacer()
+ Button("Open \(String(localized: Tool.homebrew.title))") { Navigator.shared.show(.homebrew) }
+ }
}
}
// Homebrew removes the links its cask made, and no other.
diff --git a/PeelTests/SelfUninstallWayTests.swift b/PeelTests/SelfUninstallWayTests.swift
index 84c6d8b0..460e3f9e 100644
--- a/PeelTests/SelfUninstallWayTests.swift
+++ b/PeelTests/SelfUninstallWayTests.swift
@@ -12,4 +12,20 @@ struct SelfUninstallWayTests {
#expect(SelfUninstall.way(cask: nil, homebrewKnowsItsApps: true) == .removePeel)
#expect(SelfUninstall.way(cask: cask, homebrewKnowsItsApps: false) == .homebrew("brew uninstall --zap --cask peel"))
}
+
+ /// Once Homebrew's reading ended without an answer, Remove Peel says why, as the Homebrew page does, rather than
+ /// waiting for an answer that isn't coming.
+ @Test func saysWhyHomebrewDidntSayWhetherItInstalledThisCopy() {
+ #expect(
+ SelfUninstall.way(cask: nil, homebrewKnowsItsApps: false, unanswered: .readingFailed)
+ == .homebrewDidNotAnswer(.readingFailed)
+ )
+ #expect(
+ SelfUninstall.way(cask: nil, homebrewKnowsItsApps: false, unanswered: .hasToUpdate)
+ == .homebrewDidNotAnswer(.hasToUpdate)
+ )
+ #expect(SelfUninstall.way(cask: nil, homebrewKnowsItsApps: true, unanswered: nil) == .removePeel)
+ #expect(SelfUninstall.Way.homebrewDidNotAnswer(.readingFailed).waitsForHomebrew)
+ #expect(!SelfUninstall.Way.removePeel.waitsForHomebrew)
+ }
}