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
Give the Shell tab the shell Terminal opens, so its test reads alike on any Mac
Țugui Dragoș4238f528143b
diff --git a/Peel/Model/ShellLibrary.swift b/Peel/Model/ShellLibrary.swiftindex 631aa479..c8e4dcf0 100644--- a/Peel/Model/ShellLibrary.swift+++ b/Peel/Model/ShellLibrary.swift@@ -17,13 +17,19 @@ final class ShellLibrary {let file: URLprivate let home: URL+ private let terminal: any TerminalSettingsStoringprivate(set) var state: State?private(set) var wasRefused = falseprivate(set) var draft = Prompt()- init(folder: URL = PeelFolder.url, home: URL = .homeDirectory) {+ init(+ folder: URL = PeelFolder.url,+ home: URL = .homeDirectory,+ terminal: any TerminalSettingsStoring = TerminalSettings()+ ) {file = ShellFile.url(in: folder)self.home = home+ self.terminal = terminal}var line: String {@@ -39,7 +45,7 @@ final class ShellLibrary {if known == nil {known = await ShellFile.knownToZsh()}- let shell = ShellSessions.inTerminal(TerminalSettings(), home: home)+ let shell = ShellSessions.inTerminal(terminal, home: home)let startupFile = await shell?.zshrc(home: home)let choices = ShellFile.read(file)let isSourced = startupFile.map { ShellFile.isSourced(file, from: $0, home: home) } ?? falsediff --git a/PeelTests/TerminalLibrariesTests.swift b/PeelTests/TerminalLibrariesTests.swiftindex 9742f723..bb02d7f5 100644--- a/PeelTests/TerminalLibrariesTests.swift+++ b/PeelTests/TerminalLibrariesTests.swift@@ -79,7 +79,9 @@ struct TerminalLibrariesTests {let home = try madeUpHome()defer { try? FileManager.default.removeItem(at: home) }let folder = home.appending(path: "Library/Application Support/Peel", directoryHint: .isDirectory)- let library = ShellLibrary(folder: folder, home: home)+ let terminal = FakeTerminalSettings()+ terminal.shellSetting = "/bin/zsh"+ let library = ShellLibrary(folder: folder, home: home, terminal: terminal)try ("precmd() { PROMPT='mine> ' }\n" + library.line + "\n").write(to: home.appending(path: ".zshrc"), atomically: true, encoding: .utf8)try "export ZDOTDIR=\"$HOME\"\n".write(to: home.appending(path: ".zshenv"), atomically: true, encoding: .utf8)@@ -94,6 +96,21 @@ struct TerminalLibrariesTests {#expect(library.state?.shownPrompt?.prompt == "mine> ")}+ @Test func theShellTabLooksForNoZshrcWhenTerminalOpensBash() async throws {+ let home = try madeUpHome()+ defer { try? FileManager.default.removeItem(at: home) }+ let folder = home.appending(path: "Library/Application Support/Peel", directoryHint: .isDirectory)+ let terminal = FakeTerminalSettings()+ terminal.shellSetting = "/bin/bash"+ let library = ShellLibrary(folder: folder, home: home, terminal: terminal)+ try (library.line + "\n").write(to: home.appending(path: ".zshrc"), atomically: true, encoding: .utf8)++ await library.refresh()+ #expect(library.state?.shell == .bash)+ #expect(library.state?.startupFile == nil)+ #expect(library.state?.isSourced == false)+ }+@Test func theTerminalTabKnowsFromTheStartWhenTerminalsProfilesCannotBeRead() throws {let home = try madeUpHome()defer { try? FileManager.default.removeItem(at: home) }