Skip to content

fix(cli): report unknown export options #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omlahore merged 3 commits into from
Oct 24, 2026
Merged

fix(cli): report unknown export options #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef63d08
fix(cli): report unknown export options
dxnnystyles Oct 24, 2026
d875aea
test(cli): cover unknown export options
dxnnystyles Oct 24, 2026
3f92f46
test(cli): normalize colored export errors
dxnnystyles Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Sources/removemacai/SelfTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ func selfTest() -> Bool {
return false
}

check(unknownOption(in: ["RemoveMacAI.mobileconfig", "--bogus"]) == "--bogus"
&& unknownOption(in: ["RemoveMacAI.mobileconfig", "analytics"]) == nil,
"export distinguishes unknown options from tweak names")
let invalidProfile = FileManager.default.temporaryDirectory
.appendingPathComponent("removemacai-export-selftest-\(UUID().uuidString).mobileconfig")
defer { try? FileManager.default.removeItem(at: invalidProfile) }
let executable = Bundle.main.executableURL?.path ?? CommandLine.arguments[0]
let invalidExport = Shell.run(executable, ["export", invalidProfile.path, "--bogus"])
let invalidExportOutput = invalidExport.output.replacingOccurrences(
of: #"\x1B\[[0-9;]*m"#, with: "", options: .regularExpression)
check(!invalidExport.ok && invalidExportOutput.contains("error: unknown option --bogus")
&& !FileManager.default.fileExists(atPath: invalidProfile.path),
"export rejects unknown options without writing a profile")

check(Set(Catalog.setsToRemove(keeping: [])) == Set(Catalog.availableModelSets.map(\.name)),
"off removes every model set this macOS has")
let keptWriting = Catalog.setsToRemove(keeping: ["writing-tools"])
Expand Down
10 changes: 7 additions & 3 deletions Sources/removemacai/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ func option(_ name: String) -> String? {
args.removeSubrange(i...(i + 1))
return value
}
func unknownOption(in args: [String]) -> String? {
args.first(where: { $0.hasPrefix("-") })
}
func presetOption() -> Preset? {
guard let name = option("--preset") else { return nil }
guard let preset = Preset(rawValue: name) else {
Expand Down Expand Up @@ -102,13 +105,13 @@ case "apply":
let preset = presetOption()
let dryRun = flag("--dry-run")
let yes = flag("--yes") || flag("-y")
if let bad = args.first(where: { $0.hasPrefix("-") }) { Term.fail("unknown option \(bad)") }
if let bad = unknownOption(in: args) { Term.fail("unknown option \(bad)") }
exit(TweakCommands.apply(ids: args, preset: preset, dryRun: dryRun, yes: yes) ? 0 : 1)
case "undo":
args.removeFirst()
let dryRun = flag("--dry-run")
let yes = flag("--yes") || flag("-y")
if let bad = args.first(where: { $0.hasPrefix("-") }) { Term.fail("unknown option \(bad)") }
if let bad = unknownOption(in: args) { Term.fail("unknown option \(bad)") }
exit(TweakCommands.undo(ids: args, dryRun: dryRun, yes: yes) ? 0 : 1)
case "background":
args.removeFirst()
Expand All @@ -118,13 +121,14 @@ case "clean":
args.removeFirst()
let dryRun = flag("--dry-run")
let yes = flag("--yes") || flag("-y")
if let bad = args.first(where: { $0.hasPrefix("-") }) { Term.fail("unknown option \(bad)") }
if let bad = unknownOption(in: args) { Term.fail("unknown option \(bad)") }
exit(TweakCommands.clean(ids: args, dryRun: dryRun, yes: yes) ? 0 : 1)
case "export":
args.removeFirst()
let preset = presetOption()
let keep = Set((option("--keep") ?? "").split(separator: ",").map { String($0).trimmed }.filter { !$0.isEmpty })
let noAI = flag("--no-ai")
if let bad = unknownOption(in: args) { Term.fail("unknown option \(bad)") }
guard let path = args.first else { Term.fail("name the file to write, for example: removemacai export RemoveMacAI.mobileconfig") }
TweakCommands.export(path: path, ids: Array(args.dropFirst()), preset: preset, keepAI: keep, noAI: noAI)
case "selftest":
Expand Down