Skip to content

Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.

engine accept: only a missing manifest reads as not installed, a damaged one keeps its own error. The Chinese README loses the old engine id too.

Gauthier Piarrette1e8bb3cc768d
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 46374a8..ef18604 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -66,7 +66,7 @@ git clone https://github.com/gauthierpiarrette/highball && cd highball #
git clone https://github.com/gauthierpiarrette/highball-db ../highball-db # 配方和游戏数据库(CC0)
swift build -c release
.build/release/highball engine install spike/engine-manifest.json
-.build/release/highball engine accept x64-sikarugir10.0_6-r2 apple-gptk-license-2023-08-17 # 可选:启用 D3DMetal
+.build/release/highball engine accept <the id install printed> apple-gptk-license-2023-08-17 # 可选:启用 D3DMetal
.build/release/highball bottle create play --recipe steam
.build/release/highball run play Steam
```
diff --git a/Sources/highball/main.swift b/Sources/highball/main.swift
index 79f3163..afca503 100644
--- a/Sources/highball/main.swift
+++ b/Sources/highball/main.swift
@@ -28,10 +28,10 @@ struct Engine: AsyncParsableCommand {
@Argument var license: String
func run() async throws {
let store = EngineStore()
- guard let installed = try? store.engine(engine) else {
+ guard FileManager.default.fileExists(atPath: HighballPaths().engine(engine).appending(path: "manifest.json").path) else {
fail("engine '\(engine)' is not installed; `highball engine list` shows the ids")
}
- let e = try store.accept(license: license, engine: installed)
+ let e = try store.accept(license: license, engine: store.engine(engine))
print("accepted \(license) for \(e.id); renderers now: \(HighballKit.Renderer.allCases.filter { $0 == .wined3d || e.rendererDir($0.rawValue) != nil }.map(\.rawValue).joined(separator: ","))")
}
}
diff --git a/Tests/HighballKitTests/RegressionTests.swift b/Tests/HighballKitTests/RegressionTests.swift
index 464fa86..d7a95f0 100644
--- a/Tests/HighballKitTests/RegressionTests.swift
+++ b/Tests/HighballKitTests/RegressionTests.swift
@@ -1115,8 +1115,6 @@ extension RegressionTests {
XCTAssertEqual(ids(installed: [], current: "x64-gone-r1"), ["x64-b-r3", "x64-a-r11", "x64-a-r10", "x64-gone-r1"])
}
- // Forza Horizon 6's second route: an environment on the route's line goes by the route, every other by the recipe,
- // under one id, so what an environment records for the game stays in one place.
/// highball#618: a long digest lost its end to the URL limit, and the end is the crash.
func testAReportTooLongForItsURLKeepsBothEnds() throws {
let lines = ["# gin engine header"] + (0..<400).map { "0123:err:ole:class \($0) not registered, padded out to make the digest long" } + ["unhandled exception at the very end"]
@@ -1128,6 +1126,8 @@ extension RegressionTests {
XCTAssertLessThan(BugReport.shortened(few).count, few.count, "a text it can't cut between lines still gets shorter")
}
+ // Forza Horizon 6's second route: an environment on the route's line goes by the route, every other by the recipe,
+ // under one id, so what an environment records for the game stays in one place.
func testPreviewRouteAppliesOnlyOnItsOwnLine() throws {
let json = #"""
{"id":"game","kind":"game","title":"Game","renderer":"d3dmetal","engine":"x64-a-r18","minMemoryGB":null,