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
Peel says when Homebrew's own settings undo how it runs Homebrew
Țugui Dragoș2b52d6c05f3d
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.mdindex 9e142f60..1c835304 100644--- a/ARCHITECTURE.md+++ b/ARCHITECTURE.md@@ -110,7 +110,8 @@ A handful of ideas carry most of the weight. Each is enforced in one place and tfor fails. Three actions can't be undone by History, and each says so where it is confirmed: Homebrew's own uninstalland clean up, and resetting an app's privacy permissions. Forgetting a preference domain happens only once its file isin the Trash, so putting the file back undoes it. Every `brew` call runs without Homebrew's automatic cleanup- (`HOMEBREW_NO_INSTALL_CLEANUP`), so an upgrade never deletes on its own.+ (`HOMEBREW_NO_INSTALL_CLEANUP`), so an upgrade never deletes on its own; when a `brew.env` file of the user's turns+ that back on (`Homebrew.overrides()`, from `brew config`), the Homebrew page says so and leaves upgrades to Terminal.- **One guard.** `RemovalGuard` decides, for the app and the `peel` tool alike, whether an item may move. Itslist of what nothing can bring back lives in `ProtectedData`, in PeelPrivileged, so the helper applies thesame list without asking the app. The guard judges the item and not the spelling of its path: each rule isdiff --git a/CONTRIBUTING.md b/CONTRIBUTING.mdindex 77fc4974..4d10a970 100644--- a/CONTRIBUTING.md+++ b/CONTRIBUTING.md@@ -18,7 +18,8 @@ be undone by History, and each says so where the user confirms it: Homebrew's owan app's privacy permissions. `defaults delete` for an app's preferences runs only once their file is in the Trash, anda reset exports the domain first, so putting the file back undoes it; putting saved settings back clears a domain onlyonce it has been saved as a copy of its own, and asks first. Every `brew` call runs with `HOMEBREW_NO_INSTALL_CLEANUP`,-so an upgrade never cleans up on its own.+so an upgrade never cleans up on its own, and when a `brew.env` file turns that back on (`Homebrew.overrides()`), Peel+leaves upgrades to Terminal.## What you needdiff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstringsindex c3ed0976..9564a122 100644--- a/Localization/Peel/Localizable.xcstrings+++ b/Localization/Peel/Localizable.xcstrings@@ -6302,6 +6302,112 @@}}},+ "A brew.env file sets this, in /etc/homebrew, in %@, or in ~/.homebrew." : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Nastavuje to soubor brew.env ve složce /etc/homebrew, %@ nebo ~/.homebrew."+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Festgelegt ist dies in einer brew.env-Datei in /etc/homebrew, in %@ oder in ~/.homebrew."+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Esto lo establece un archivo brew.env en /etc/homebrew, en %@ o en ~/.homebrew."+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Cela provient d’un fichier brew.env situé dans /etc/homebrew, dans %@ ou dans ~/.homebrew."+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Questo è impostato in un file brew.env che si trova in /etc/homebrew, in %@ o in ~/.homebrew."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "これは、/etc/homebrew、%@、または~/.homebrewにあるbrew.envファイルで設定されています。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "이 설정은 /etc/homebrew, %@ 또는 ~/.homebrew에 있는 brew.env 파일에 지정되어 있습니다."+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Dit wordt ingesteld door een brew.env-bestand in /etc/homebrew, in %@ of in ~/.homebrew."+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Ustawia to plik brew.env w /etc/homebrew, w %@ lub w ~/.homebrew."+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Isso é definido por um arquivo brew.env em /etc/homebrew, em %@ ou em ~/.homebrew."+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Acest lucru este stabilit de un fișier brew.env, aflat în /etc/homebrew, în %@ sau în ~/.homebrew."+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Это задает файл brew.env в /etc/homebrew, в %@ или в ~/.homebrew."+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Det här ställs in i en brew.env-fil i /etc/homebrew, i %@ eller i ~/.homebrew."+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Bunu, /etc/homebrew, %@ veya ~/.homebrew içindeki bir brew.env dosyası ayarlıyor."+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Це задано у файлі brew.env у /etc/homebrew, у %@ або в ~/.homebrew."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "这是由/etc/homebrew、%@或~/.homebrew中的brew.env文件设置的。"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "這是由位於/etc/homebrew、%@或~/.homebrew中的brew.env檔案所設定。"+ }+ }+ }+ },"A caution about %@" : {"localizations" : {"cs" : {@@ -37219,6 +37325,112 @@}}},+ "Homebrew cleans up after every upgrade, deleting old versions for good, so Peel leaves upgrades to Terminal." : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew po každém upgradu provede čištění, při kterém trvale smaže staré verze, a proto Peel upgrady přenechává Terminálu."+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew führt nach jedem Upgrade eine Bereinigung aus und löscht dabei alte Versionen endgültig, daher überlässt Peel Upgrades dem Terminal."+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew hace limpieza tras cada actualización de paquetes y borra definitivamente las versiones antiguas, así que Peel deja las actualizaciones en manos de Terminal."+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Après chaque mise à niveau, Homebrew effectue un nettoyage qui supprime définitivement les anciennes versions : Peel laisse donc les mises à niveau à Terminal."+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew fa pulizia dopo ogni aggiornamento, eliminando definitivamente le vecchie versioni, quindi Peel lascia gli aggiornamenti a Terminale."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrewはアップグレード後に毎回クリーンアップを実行して古いバージョンを完全に削除するため、Peelはアップグレードをターミナルに任せています。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew는 업그레이드가 끝날 때마다 정리를 실행하여 이전 버전을 영구적으로 삭제하므로, Peel은 업그레이드를 터미널에 맡깁니다."+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew ruimt na elke upgrade op en verwijdert daarbij oude versies definitief, dus Peel laat upgrades over aan Terminal."+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew robi porządki po każdym uaktualnieniu, trwale usuwając stare wersje, więc Peel zostawia uaktualnianie Terminalowi."+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "O Homebrew faz uma limpeza depois de cada upgrade, apagando as versões antigas definitivamente, então o Peel deixa os upgrades para o Terminal."+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew face curățenie după fiecare upgrade, ștergând definitiv versiunile vechi, așa că Peel lasă upgrade‑urile în seama aplicației Terminal."+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew выполняет очистку после каждого обновления, безвозвратно удаляя старые версии, поэтому Peel оставляет обновления Терминалу."+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew rensar upp efter varje uppgradering och raderar gamla versioner permanent, så Peel överlåter uppgraderingar åt Terminal."+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew her yükseltmeden sonra temizlik yapar ve eski sürümleri kalıcı olarak siler, bu yüzden Peel yükseltmeleri Terminal’e bırakır."+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew після кожного оновлення пакетів виконує очищення, назавжди видаляючи старі версії, тож Peel не запускає оновлення сама, а залишає це Терміналу."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew会在每次升级后进行清理,永久删除旧版本,因此Peel将升级交给“终端”。"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew每次升級後都會自動清理並永久刪除舊版本,因此Peel將升級交由「終端機」執行。"+ }+ }+ }+ },"Homebrew couldn’t finish" : {"localizations" : {"cs" : {@@ -39657,6 +39869,112 @@}}},+ "Homebrew may download its list of packages when Peel only asks about them." : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew může stáhnout svůj seznam balíčků i tehdy, když se na ně Peel jen ptá."+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew lädt möglicherweise seine Paketliste aus dem Internet, wenn Peel nur nach den Paketen fragt."+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew puede descargar su lista de paquetes cuando Peel solo le pregunta por ellos."+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew peut télécharger sa liste de paquets alors que Peel ne fait que l’interroger à leur sujet."+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew potrebbe scaricare il suo elenco di pacchetti anche quando Peel si limita a chiedergli informazioni sui pacchetti."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrewは、Peelがパッケージについて問い合わせるだけでも、パッケージリストをダウンロードすることがあります。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel이 패키지에 대해 묻기만 해도 Homebrew가 패키지 목록을 다운로드할 수 있습니다."+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew kan de eigen pakketlijst downloaden wanneer Peel alleen naar de pakketten vraagt."+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew może pobrać swoją listę pakietów, nawet gdy Peel tylko o nie pyta."+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "O Homebrew pode baixar a lista de pacotes dele quando o Peel só pergunta sobre eles."+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew își poate descărca lista de pachete atunci când Peel doar întreabă despre ele."+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew может загрузить свой список пакетов, даже когда Peel лишь спрашивает о них."+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew kan hämta sin paketlista även när Peel bara frågar om paketen."+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew, Peel ona paketleri yalnızca sorduğunda bile paket listesini indirebilir."+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew може викачувати свій список пакетів, навіть коли Peel лише запитує про них."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "即使Peel只是查询软件包,Homebrew也可能会下载其软件包列表。"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "即使Peel只是查詢套件,Homebrew也可能會下載套件列表。"+ }+ }+ }+ },"Homebrew needs an administrator’s password for this, and only Terminal can ask for it. Copy the command, then run it in Terminal." : {"localizations" : {"cs" : {@@ -40081,6 +40399,112 @@}}},+ "Homebrew sends its makers analytics whenever Peel runs it." : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew odesílá svým tvůrcům analytické údaje pokaždé, když ho Peel spustí."+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew sendet Analysedaten an seine Hersteller, wann immer Peel es ausführt."+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew envía datos de uso a sus creadores cada vez que Peel lo ejecuta."+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew envoie des données d’analyse à son éditeur chaque fois que Peel l’exécute."+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew invia dati di utilizzo ai suoi produttori ogni volta che Peel lo esegue."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrewは、Peelが実行するたびに、開発元に解析データを送信します。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Peel이 Homebrew를 실행할 때마다 Homebrew가 제작자에게 분석 정보를 보냅니다."+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew stuurt analysegegevens naar zijn makers telkens wanneer Peel het uitvoert."+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew wysyła swoim producentom dane analiz za każdym razem, gdy Peel go uruchamia."+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "O Homebrew envia dados de uso aos fabricantes dele sempre que o Peel o executa."+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew trimite producătorilor săi date de analiză ori de câte ori Peel îl rulează."+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew отправляет аналитику своим разработчикам каждый раз, когда Peel его запускает."+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew skickar analysdata till sina tillverkare varje gång Peel kör det."+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew, Peel onu her çalıştırdığında üreticilerine analiz verileri gönderir."+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew надсилає аналітику своїм розробникам щоразу, коли Peel його запускає."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew会在Peel每次运行它时向其开发者发送分析数据。"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew每次由Peel執行時,都會傳送分析資料給它的廠商。"+ }+ }+ }+ },"Homebrew skipped ^[%lld installed package](inflect: true) with no source to check against." : {"localizations" : {"cs" : {@@ -40951,6 +41375,112 @@}}},+ "Homebrew’s Own Settings Change How Peel Runs It" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vlastní nastavení Homebrew mění, jak ho Peel spouští"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Die eigenen Einstellungen von Homebrew ändern, wie Peel es ausführt"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Los propios ajustes de Homebrew cambian cómo lo ejecuta Peel"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Les réglages propres à Homebrew modifient la façon dont Peel l’exécute"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Le impostazioni di Homebrew cambiano il modo in cui Peel lo esegue"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew自身の設定により、Peelが実行するときの動作が変わります"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew 자체 설정이 Peel의 Homebrew 실행 방식을 변경함"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "De eigen instellingen van Homebrew veranderen hoe Peel het uitvoert"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Własne ustawienia Homebrew zmieniają sposób, w jaki Peel go uruchamia"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Os Ajustes do Próprio Homebrew Mudam Como o Peel o Executa"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Configurările proprii ale Homebrew schimbă modul în care Peel îl rulează"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Собственные настройки Homebrew меняют то, как Peel его запускает"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrews egna inställningar ändrar hur Peel kör det"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew’un Kendi Ayarları, Peel’in Onu Çalıştırma Biçimini Değiştiriyor"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Власні налаштування Homebrew змінюють те, як Peel його запускає"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew自己的设置改变了Peel运行它的方式"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Homebrew自己的設定會改變Peel執行它的方式"+ }+ }+ }+ },"Homebrew’s own housekeeping, run by Homebrew. Peel adds nothing of its own." : {"localizations" : {"cs" : {diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swiftindex 0ae987ea..9ecbf9b7 100644--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift@@ -640,9 +640,47 @@ public enum Homebrew {}}+ /// What Homebrew's own settings undo of the environment Peel runs it in. `bin/brew` reads `brew.env` files after+ /// that environment (`/etc/homebrew`, the prefix's `etc/homebrew`, and `~/.homebrew`), and a line there with no+ /// value turns one of Peel's settings off.+ public struct Overrides: OptionSet, Sendable, Hashable {+ public let rawValue: Int++ public init(rawValue: Int) {+ self.rawValue = rawValue+ }++ /// An upgrade runs `brew cleanup` by itself, which deletes old versions for good.+ public static let cleansUp = Overrides(rawValue: 1 << 0)+ /// Homebrew sends analytics when Peel runs it.+ public static let sendsAnalytics = Overrides(rawValue: 1 << 1)+ /// Homebrew may update its package lists, over the network, when Peel only asks about them.+ public static let updatesItself = Overrides(rawValue: 1 << 2)++ /// Reads `brew config`'s answer, which lists each setting in effect as `NAME: set`.+ init(config: String) {+ let set = Set(config.split(whereSeparator: \.isNewline).compactMap { line -> Substring? in+ guard line.hasSuffix(": set") else { return nil }+ return line.dropLast(": set".count)+ })+ self = []+ if !set.contains("HOMEBREW_NO_INSTALL_CLEANUP") { insert(.cleansUp) }+ if !set.contains("HOMEBREW_NO_ANALYTICS") { insert(.sendsAnalytics) }+ if !set.contains("HOMEBREW_NO_AUTO_UPDATE") || set.contains("HOMEBREW_FORCE_API_AUTO_UPDATE") { insert(.updatesItself) }+ }+ }++ /// What Homebrew's own settings undo, as it says itself. Nil when it would not say.+ @concurrent+ public static func overrides() async -> Overrides? {+ guard let config = try? await answer(["config"]) else { return nil }+ return Overrides(config: config)+ }+/// The environment every `brew` call runs in. It is built from nothing rather than inherited: a `HOMEBREW_*`/// value set anywhere in the user's session would otherwise decide how Homebrew behaves, and- /// `HOMEBREW_FORCE_API_AUTO_UPDATE` would undo the setting that keeps Peel off the network.+ /// `HOMEBREW_FORCE_API_AUTO_UPDATE` would undo the setting that keeps Peel off the network. Homebrew's own+ /// `brew.env` files are read after it and can still undo a setting here, which `overrides()` reports.static func environment(autoUpdate: Bool) -> [String: String] {var values = ["PATH": "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swiftindex daa920f6..3e03750f 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift@@ -32,6 +32,32 @@ struct HomebrewTests {#expect(asked.withLock { $0 } == ["--formula", "--cask"])}+ /// Homebrew reads its own `brew.env` files after Peel's environment, and a line there with no value, such as+ /// `HOMEBREW_NO_INSTALL_CLEANUP=`, turns Peel's setting off (`bin/brew` and `env_config.rb`, 7.0.4). `brew config`+ /// lists what is in effect: these are its answers in Peel's environment with such a file, as it wrote them.+ @Test func readsWhatHomebrewsOwnSettingsUndo() {+ let plain = """+ HOMEBREW_VERSION: 7.0.4-17-g2f1c682+ HOMEBREW_PREFIX: /opt/homebrew+ HOMEBREW_NO_ANALYTICS: set+ HOMEBREW_NO_AUTO_UPDATE: set+ HOMEBREW_NO_COLOR: set+ HOMEBREW_NO_ENV_HINTS: set+ HOMEBREW_NO_INSTALL_CLEANUP: set+ """+ let emptied = """+ HOMEBREW_VERSION: 7.0.4-17-g2f1c682+ HOMEBREW_PREFIX: /opt/homebrew+ HOMEBREW_NO_COLOR: set+ HOMEBREW_NO_ENV_HINTS: set+ """+ let forced = plain.replacingOccurrences(of: "HOMEBREW_NO_ANALYTICS", with: "HOMEBREW_FORCE_API_AUTO_UPDATE: set\nHOMEBREW_NO_ANALYTICS")++ #expect(Homebrew.Overrides(config: plain).isEmpty)+ #expect(Homebrew.Overrides(config: emptied) == [.cleansUp, .sendsAnalytics, .updatesItself])+ #expect(Homebrew.Overrides(config: forced) == [.updatesItself])+ }+/// A stop is the person's: once the formulae were stopped, the casks are not started.@Test func aStoppedUpgradeStartsNothingMore() async {let packages = [HomebrewPackage(name: "wget", kind: .formula, installedVersion: "1.0"), HomebrewPackage(name: "firefox", kind: .cask, installedVersion: "1.0")]diff --git a/Peel/Model/HomebrewLibrary.swift b/Peel/Model/HomebrewLibrary.swiftindex f9301b12..34e87337 100644--- a/Peel/Model/HomebrewLibrary.swift+++ b/Peel/Model/HomebrewLibrary.swift@@ -48,6 +48,8 @@ final class HomebrewLibrary {private(set) var installation: HomebrewInstallation?/// What `brew cleanup` would free, as Homebrew reported it. Nil when it wouldn't say.private(set) var reclaimable: Int64?+ /// What Homebrew's own settings undo of how Peel runs it, read with the page and before an upgrade.+ private(set) var overrides: Homebrew.Overrides = []/// Homebrew has no local copy of its package definitions, for example because its cache was cleared (not/// by Peel: its Developer page leaves them alone). Any question would make Homebrew download them again,/// at launch and on every change in an Applications folder, which would be Peel contacting the network on@@ -107,9 +109,10 @@ final class HomebrewLibrary {return retired.filter { $0.retirement?.stage == .disabled } + retired.filter { $0.retirement?.stage == .deprecated }}- /// What Upgrade All upgrades: the rest are shown as out of date and left alone (`joinsUpgradeAll`).+ /// What Upgrade All upgrades: the rest are shown as out of date and left alone (`joinsUpgradeAll`), and all of+ /// them while Homebrew would clean up after an upgrade, which deletes old versions for good.var upgradable: [HomebrewPackage] {- outdated.filter(\.joinsUpgradeAll)+ overrides.contains(.cleansUp) ? [] : outdated.filter(\.joinsUpgradeAll)}func count(of kind: HomebrewPackage.Kind) -> Int {@@ -124,7 +127,7 @@ final class HomebrewLibrary {isInstalled = Homebrew.executableURL != nilguard isInstalled else { return }guard let reading = await scanRun.run({ await self.read(includingReclaimable: includingReclaimable) }) else { return }- guard let (found, installed, bytes) = reading else {+ guard let (found, installed, bytes, overridden) = reading else {needsDefinitions = truepackages = packages ?? []return@@ -142,6 +145,7 @@ final class HomebrewLibrary {self.installation = found// Keeps the last figure when this reading brought none: one that was right a moment ago beats none.self.reclaimable = bytes ?? self.reclaimable+ overrides = overridden ?? overridesrevision += 1if let selection, packages?.contains(where: { $0.id == selection }) != true {self.selection = nil@@ -149,20 +153,23 @@ final class HomebrewLibrary {}/// Nil while Homebrew has no local definitions to read, as when `brew update` has never run.- private func read(includingReclaimable: Bool) async -> (HomebrewInstallation?, Result<[HomebrewPackage], Homebrew.CommandFailure>, Int64?)? {+ private func read(+ includingReclaimable: Bool+ ) async -> (HomebrewInstallation?, Result<[HomebrewPackage], Homebrew.CommandFailure>, Int64?, Homebrew.Overrides?)? {guard await Homebrew.hasLocalDefinitions() else { return nil }needsDefinitions = false- // The installation is read first, since it says how to read the figures that follow. The other two- // questions take about as long as each other, so they run at the same time.+ // The installation is read first, since it says how to read the figures that follow. The other questions+ // take about as long as each other, so they run at the same time. Only the page shows the last two.let found = await Homebrew.installation()async let reclaimable = includingReclaimable ? Homebrew.reclaimableBytes(asWrittenBy: found) : nil+ async let overridden = includingReclaimable ? Homebrew.overrides() : nillet installed: Result<[HomebrewPackage], Homebrew.CommandFailure>do {installed = .success(try await Homebrew.installedPackages())} catch {installed = .failure(error)}- return (found, installed, await reclaimable)+ return (found, installed, await reclaimable, await overridden)}/// Runs `command` and returns its result to the caller. Only one command runs at a time: while one runs,@@ -197,6 +204,9 @@ final class HomebrewLibrary {advisories = nil}let gone = CommandResult(succeeded: false, output: String(localized: "Homebrew no longer lists this package."))+ if command.isUpgrade, await cleansUpAfterUpgrading() {+ return CommandResult(succeeded: false, output: String(localized: Self.cleansUp))+ }do {let output: Stringswitch command {@@ -232,6 +242,15 @@ final class HomebrewLibrary {}}+ /// Said where Peel leaves upgrades to Terminal because Homebrew would clean up after them.+ static let cleansUp: LocalizedStringResource = "Homebrew cleans up after every upgrade, deleting old versions for good, so Peel leaves upgrades to Terminal."++ /// Asks Homebrew again right before an upgrade, since its settings can change while the page is open.+ private func cleansUpAfterUpgrading() async -> Bool {+ overrides = await Homebrew.overrides() ?? overrides+ return overrides.contains(.cleansUp)+ }+/// Runs an upgrade while `progress` shows what Homebrew writes, in the order it writes it, with Peel's own/// sentence where a stop or a failure to start happened. That whole transcript is the result, a stopped run's/// included, since it is where Homebrew says what it had done.diff --git a/Peel/Views/AppDetailView.swift b/Peel/Views/AppDetailView.swiftindex c65ec781..f4278650 100644--- a/Peel/Views/AppDetailView.swift+++ b/Peel/Views/AppDetailView.swift@@ -414,16 +414,19 @@ struct AppDetailView: View {private func updateExplanation(for source: UpdateSource) -> LocalizedStringResource {switch source {case .appStore: "The App Store has it. Update from the App Store."- case .homebrew where upgradeNeedsTerminal:+ case .homebrew where library.cask(for: plan.app)?.upgradeNeedsAnAdministrator == true:"Homebrew needs an administrator’s password for this, and only Terminal can ask for it. Copy the command, then run it in Terminal."+ case .homebrew where homebrew.overrides.contains(.cleansUp):+ HomebrewLibrary.cleansUpcase .homebrew: "Homebrew has it. Peel can run the upgrade for you."case .developer, .automatic: "The maker has it. Update from inside the app."}}- /// Whether the cask asks for an administrator's password when it upgrades, which only Terminal can give.+ /// Whether the cask's upgrade is left to Terminal: it asks for an administrator's password, which only Terminal+ /// can give, or Homebrew would clean up after it.private var upgradeNeedsTerminal: Bool {- library.cask(for: plan.app)?.upgradeNeedsAnAdministrator == true+ library.cask(for: plan.app)?.upgradeNeedsAnAdministrator == true || homebrew.overrides.contains(.cleansUp)}@ViewBuilderdiff --git a/Peel/Views/Homebrew/HomebrewDetailView.swift b/Peel/Views/Homebrew/HomebrewDetailView.swiftindex d27602bd..1b0f916d 100644--- a/Peel/Views/Homebrew/HomebrewDetailView.swift+++ b/Peel/Views/Homebrew/HomebrewDetailView.swift@@ -85,8 +85,9 @@ struct HomebrewDetailView: View {Section {HStack {if package.isOutdated {- if package.upgradeNeedsAnAdministrator {- CopyButton(text: "brew upgrade --cask \(package.fullName)", title: "Copy Upgrade Command")+ if package.upgradeNeedsAnAdministrator || homebrew.overrides.contains(.cleansUp) {+ let kind = package.kind == .cask ? "--cask" : "--formula"+ CopyButton(text: "brew upgrade \(kind) \(package.fullName)", title: "Copy Upgrade Command")} else {Button("Upgrade", systemImage: "arrow.down.circle") {Task { await homebrew.run(.upgrade(package.id)) }@@ -115,6 +116,11 @@ struct HomebrewDetailView: View {}}.disabled(homebrew.runningCommand != nil)+ if package.isOutdated, homebrew.overrides.contains(.cleansUp) {+ Text(HomebrewLibrary.cleansUp)+ .font(.callout)+ .foregroundStyle(.secondary)+ }if (package.isOutdated && package.upgradeNeedsAnAdministrator) || isUninstalledInTerminal {Text(needsTerminal).font(.callout)diff --git a/Peel/Views/Homebrew/HomebrewList.swift b/Peel/Views/Homebrew/HomebrewList.swiftindex 97f3b29a..88fd7a1d 100644--- a/Peel/Views/Homebrew/HomebrewList.swift+++ b/Peel/Views/Homebrew/HomebrewList.swift@@ -18,6 +18,7 @@ struct HomebrewList: View {// While searching, the page lists only the matching packages and hides every other section.if searchText.isEmpty, homebrew.isInstalled, !homebrew.needsDefinitions {installation+ overriddenmaintenancehealthvulnerabilities@@ -83,6 +84,29 @@ struct HomebrewList: View {// MARK: - Homebrew itself+ /// What Homebrew's own settings undo of how Peel runs it, said before anything is run.+ @ViewBuilder+ private var overridden: some View {+ let overrides = homebrew.overrides+ if !overrides.isEmpty {+ Section {+ Notice(title: Text("Homebrew’s Own Settings Change How Peel Runs It"), detail: Text(verbatim: explanation(of: overrides)), kind: .caution) {}+ }+ }+ }++ private func explanation(of overrides: Homebrew.Overrides) -> String {+ var sentences: [String] = []+ if overrides.contains(.cleansUp) { sentences.append(String(localized: HomebrewLibrary.cleansUp)) }+ if overrides.contains(.sendsAnalytics) { sentences.append(String(localized: "Homebrew sends its makers analytics whenever Peel runs it.")) }+ if overrides.contains(.updatesItself) { sentences.append(String(localized: "Homebrew may download its list of packages when Peel only asks about them.")) }+ let prefix = homebrew.installation?.prefix ?? Homebrew.executableURL?.deletingLastPathComponent().deletingLastPathComponent()+ let folder = (prefix?.path(percentEncoded: false) ?? "") + "/etc/homebrew"+ sentences.append(String(localized: "A brew.env file sets this, in /etc/homebrew, in \(folder), or in ~/.homebrew."))+ // A line each, since Chinese and Japanese put no space between sentences.+ return sentences.joined(separator: "\n")+ }+private var installation: some View {Section {LabeledContent("Version") {@@ -313,7 +337,7 @@ struct HomebrewList: View {.minimumTarget()}.buttonStyle(.borderless)- .disabled(!outdated.contains(where: \.joinsUpgradeAll) || isBusy)+ .disabled(homebrew.upgradable.isEmpty || isBusy)}}}diff --git a/README.md b/README.mdindex 1ed4d926..1a5c6747 100644--- a/README.md+++ b/README.md@@ -208,7 +208,8 @@ Peel sends no analytics and has no account. On its own, it goes online only to cyou can turn that off. Each check asks one app's own update feed about that app alone, or the App Store about anapp bought there. Homebrew goes online only when you ask it to update, upgrade, or scan for vulnerabilities, andthat scan is the one time a list of what is installed leaves your Mac: the name and version of each Homebrew-formula, sent to `api.osv.dev`. Turn off Check for app updates in Settings, and Peel contacts nothing on its own.+formula, sent to `api.osv.dev`. Your own Homebrew settings (a `brew.env` file) can change that, and the Homebrew page+then says what they change. Turn off Check for app updates in Settings, and Peel contacts nothing on its own.<details><summary>Every address Peel or Homebrew may contact</summary>diff --git a/SAFETY.md b/SAFETY.mdindex fe71f363..f0474647 100644--- a/SAFETY.md+++ b/SAFETY.md@@ -123,11 +123,12 @@ free name allows, and the move then replaces the placeholder.What Peel deletes outright is only its own: its list of refusals, when `peel history --refused --clear` is asked toforget it, and such a placeholder, when the move it was made for fails.-Three things Peel starts can't be undone by History, and Peel says so before you confirm each of them: Homebrew's-own uninstall and Clean Up, which delete what they remove, and resetting an app's privacy permissions, which is off-until you choose it. An upgrade from the Homebrew page never cleans up on its own, although Homebrew would by-default. Forgetting a preference domain (described above) is not one of the three: it is done only once the file-is in the Trash, and putting the file back undoes it, until the app writes its settings again.+Three things Peel starts can't be undone by History, and Peel says so before you confirm each of them: Homebrew's own+uninstall and Clean Up, which delete what they remove, and resetting an app's privacy permissions, which is off until+you choose it. An upgrade from the Homebrew page never cleans up on its own, although Homebrew would by default. If one+of Homebrew's own settings files (`brew.env`) turns that cleanup back on, the Homebrew page says so and Peel leaves+upgrades to Terminal. Forgetting a preference domain (described above) is not one of the three: it is done only once the+file is in the Trash, and putting the file back undoes it, until the app writes its settings again.If the record itself is damaged, it is set aside under another name rather than overwritten, because it isthe only way back from a removal. If it can't be read at all, Peel moves nothing until it can, or until you