Skip to content

Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit

feat(app): name compatibility tools bridgeplay-proton-*

raymondchins2a735dd4061a
diff --git a/app/Sources/BridgeplayApp/Model/FreeEngineWinecx.swift b/app/Sources/BridgeplayApp/Model/FreeEngineWinecx.swift
index 0031485..00f3bcd 100644
--- a/app/Sources/BridgeplayApp/Model/FreeEngineWinecx.swift
+++ b/app/Sources/BridgeplayApp/Model/FreeEngineWinecx.swift
@@ -78,8 +78,8 @@ enum FreeEngineWinecx {
static let step = "Download free WineCX engine"
- // What the WineCX row installs. It gets its own tool, bridgeplay-winecx-11.17, beside
- // the 11.15 release, which keeps bridgeplay-winecx: every existing prefix is claimed by
+ // What the WineCX row installs. It gets its own tool, bridgeplay-proton-winecx-11.17, beside
+ // the 11.15 release, which keeps bridgeplay-proton-winecx: every existing prefix is claimed by
// winecx-11.15, so the default tool only moves once 11.17 is verified on real games.
static let current = v1117
static let previous = v1115
@@ -208,7 +208,7 @@ enum FreeEngineWinecx {
.i386Windows: "8ad83740df2da5e79ed435e4bc57e82b4b6a4b984fbec73e1160ca81dfce1b44",
],
tools: [
- CompatTool(name: "bridgeplay-winecx-11.17", flavor: .rosetta, display: "WineCX 11.17 (msync, D3DMetal)"),
+ CompatTool(name: "bridgeplay-proton-winecx-11.17", flavor: .rosetta, display: "WineCX 11.17 (msync, D3DMetal)"),
],
isFree: true
),
@@ -251,7 +251,7 @@ enum FreeEngineWinecx {
// runtime 4.5.125 is the last wine1115 build (winecx 5b45f45, built from winecx-gptk
// 7a0349b, minos 26.0). The same bytes are mirrored on dappermint/Whisky, which is what
- // Whisky itself downloads. It keeps the bridgeplay-winecx tool.
+ // Whisky itself downloads. It keeps the bridgeplay-proton-winecx tool.
static let v1115 = WinecxRelease(
build: "winecx-11.15",
runtime: "4.5.125",
@@ -299,7 +299,7 @@ enum FreeEngineWinecx {
.i386Windows: "23ee72664f172d38d76ecb8969d5c5af7e6828864dfe298338ed0e773910bc5d",
],
tools: [
- CompatTool(name: "bridgeplay-winecx", flavor: .rosetta, display: "WineCX 11.15 (msync, D3DMetal)"),
+ CompatTool(name: "bridgeplay-proton-winecx", flavor: .rosetta, display: "WineCX 11.15 (msync, D3DMetal)"),
],
isFree: true
),
diff --git a/app/Sources/BridgeplayApp/Model/RunnerStore.swift b/app/Sources/BridgeplayApp/Model/RunnerStore.swift
index ed5a3e1..5513c49 100644
--- a/app/Sources/BridgeplayApp/Model/RunnerStore.swift
+++ b/app/Sources/BridgeplayApp/Model/RunnerStore.swift
@@ -122,7 +122,7 @@ enum CompatToolList {
for: builds, legacy: holder, fexAvailable: fexAvailable, keeping: kept))
}
- // 1.0.x used the single 'notproton' tool name (now 'bridgeplay') and wrote no tool list, so the
+ // 1.0.x used the single 'notproton' tool name (now 'bridgeplay-proton') and wrote no tool list, so the
// runners/current symlink is the record of which version of CrossOver was deployed.
static func legacyHolder(
builds: [RunnerBuild], listed: String?, runners: URL = SupportPaths.runners
diff --git a/app/Sources/BridgeplayApp/Model/SupportedRunner.swift b/app/Sources/BridgeplayApp/Model/SupportedRunner.swift
index 79469e0..a1a04ee 100644
--- a/app/Sources/BridgeplayApp/Model/SupportedRunner.swift
+++ b/app/Sources/BridgeplayApp/Model/SupportedRunner.swift
@@ -96,16 +96,16 @@ enum SupportedRunners {
// First entry is what windows-only games get when Steam has no mapping.
static let toolPreference = [
- legacyToolName, "bridgeplay-fex", "bridgeplay-fex-rosetta", "bridgeplay-preview",
- "bridgeplay-fex-41069", "bridgeplay-fex-rosetta-41069", "bridgeplay-preview-41069",
- "bridgeplay-fex-41073", "bridgeplay-fex-rosetta-41073", "bridgeplay-preview-41073", "bridgeplay-26.3", "bridgeplay-winecx-11.17",
- "bridgeplay-winecx", "bridgeplay-winehq",
+ legacyToolName, "bridgeplay-proton-fex", "bridgeplay-proton-fex-rosetta", "bridgeplay-proton-preview",
+ "bridgeplay-proton-fex-41069", "bridgeplay-proton-fex-rosetta-41069", "bridgeplay-proton-preview-41069",
+ "bridgeplay-proton-fex-41073", "bridgeplay-proton-fex-rosetta-41073", "bridgeplay-proton-preview-41073", "bridgeplay-proton-26.3", "bridgeplay-proton-winecx-11.17",
+ "bridgeplay-proton-winecx", "bridgeplay-proton-winehq",
]
// The single tool name 1.0.x used, 'notproton' before 3.0.
- static let legacyToolName = "bridgeplay"
+ static let legacyToolName = "bridgeplay-proton"
- // The only builds that can own the 'bridgeplay' tool name.
+ // The only builds that can own the 'bridgeplay-proton' tool name.
static let legacyHolders = ["27.0.0.40921-fex", "27.0.0.40921", "27.0.0.41069-fex", "27.0.0.41069"]
enum LegacyHolder: Equatable, Sendable {
@@ -153,7 +153,7 @@ enum SupportedRunners {
.i386Windows: "e641d7b2e81ee13877823494679ba2d87e0d61b8a87e8a1ce92b4fe73631ae74",
],
tools: [
- CompatTool(name: "bridgeplay-26.3", flavor: .rosetta, display: "CrossOver 26.3"),
+ CompatTool(name: "bridgeplay-proton-26.3", flavor: .rosetta, display: "CrossOver 26.3"),
],
rebuilds: [
// crossoverchina.com
@@ -184,7 +184,7 @@ enum SupportedRunners {
.i386Windows: "25bfde1f50ee96485763968ef10b9d9ad35e38214232f17ebdc009b098af44a0",
],
tools: [
- CompatTool(name: "bridgeplay-preview", flavor: .rosetta, display: "CrossOver 2026 08 21-X86 - Rosetta"),
+ CompatTool(name: "bridgeplay-proton-preview", flavor: .rosetta, display: "CrossOver 2026 08 21-X86 - Rosetta"),
]
),
RunnerBuild(
@@ -203,8 +203,8 @@ enum SupportedRunners {
.aarch64Windows: "f40810193a5ef2520774288f354a8604f5ba91828315f643b3ee6688b873dc3f",
],
tools: [
- CompatTool(name: "bridgeplay-fex", flavor: .fex, display: "CrossOver 2026 08 21-ARM64 - FEX"),
- CompatTool(name: "bridgeplay-fex-rosetta", flavor: .rosetta, display: "CrossOver 2026 08 21-ARM64 - Rosetta"),
+ CompatTool(name: "bridgeplay-proton-fex", flavor: .fex, display: "CrossOver 2026 08 21-ARM64 - FEX"),
+ CompatTool(name: "bridgeplay-proton-fex-rosetta", flavor: .rosetta, display: "CrossOver 2026 08 21-ARM64 - Rosetta"),
]
),
RunnerBuild(
@@ -221,7 +221,7 @@ enum SupportedRunners {
.i386Windows: "0d8e3ebb57b3173f675eef5e3a0950052c592efa10a7a10193b0beb811b55ea5",
],
tools: [
- CompatTool(name: "bridgeplay-preview-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-X86 - Rosetta"),
+ CompatTool(name: "bridgeplay-proton-preview-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-X86 - Rosetta"),
]
),
RunnerBuild(
@@ -240,8 +240,8 @@ enum SupportedRunners {
.aarch64Windows: "7623c0b33350f511b431d39c7ec0c0d4f5def4183acef0eee5d4a5c694898956",
],
tools: [
- CompatTool(name: "bridgeplay-fex-41069", flavor: .fex, display: "CrossOver 2026 10 06-ARM64 - FEX"),
- CompatTool(name: "bridgeplay-fex-rosetta-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-ARM64 - Rosetta"),
+ CompatTool(name: "bridgeplay-proton-fex-41069", flavor: .fex, display: "CrossOver 2026 10 06-ARM64 - FEX"),
+ CompatTool(name: "bridgeplay-proton-fex-rosetta-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-ARM64 - Rosetta"),
]
),
RunnerBuild(
@@ -258,7 +258,7 @@ enum SupportedRunners {
.i386Windows: "88f9a1d16dd7127100eab902156390ec2a5ec67770cfddd3fd3f1237c9965309",
],
tools: [
- CompatTool(name: "bridgeplay-winehq", flavor: .rosetta, display: "WineHQ 11.15 - Rosetta"),
+ CompatTool(name: "bridgeplay-proton-winehq", flavor: .rosetta, display: "WineHQ 11.15 - Rosetta"),
],
isFree: true
),
@@ -276,7 +276,7 @@ enum SupportedRunners {
.i386Windows: "7d3df0ee9dd61693293ba74a8d2c588b4dce26fb7f7a78c0c5ed5bdc58869e14",
],
tools: [
- CompatTool(name: "bridgeplay-preview-41073", flavor: .rosetta, display: "CrossOver 2026 10 15-X86 - Rosetta"),
+ CompatTool(name: "bridgeplay-proton-preview-41073", flavor: .rosetta, display: "CrossOver 2026 10 15-X86 - Rosetta"),
]
),
RunnerBuild(
@@ -295,8 +295,8 @@ enum SupportedRunners {
.aarch64Windows: "2efb13f3303adc2c8ee61b93e027e4e94730a2e6b0162c7e6aebd4104200f07c",
],
tools: [
- CompatTool(name: "bridgeplay-fex-41073", flavor: .fex, display: "CrossOver 2026 10 15-ARM64 - FEX"),
- CompatTool(name: "bridgeplay-fex-rosetta-41073", flavor: .rosetta, display: "CrossOver 2026 10 15-ARM64 - Rosetta"),
+ CompatTool(name: "bridgeplay-proton-fex-41073", flavor: .fex, display: "CrossOver 2026 10 15-ARM64 - FEX"),
+ CompatTool(name: "bridgeplay-proton-fex-rosetta-41073", flavor: .rosetta, display: "CrossOver 2026 10 15-ARM64 - Rosetta"),
]
),
] + FreeEngineWinecx.runnerBuilds
diff --git a/app/Sources/BridgeplayApp/Support/SupportPaths.swift b/app/Sources/BridgeplayApp/Support/SupportPaths.swift
index 0dcaa9f..2abf108 100644
--- a/app/Sources/BridgeplayApp/Support/SupportPaths.swift
+++ b/app/Sources/BridgeplayApp/Support/SupportPaths.swift
@@ -153,14 +153,16 @@ enum SupportPaths {
}
}
-// Steam compatibility tool names. Bridgeplay writes bridgeplay-*; builds before 3.0 wrote
-// notproton-*, and those folders stay Bridgeplay's until BrandMigration renames them.
+// Steam compatibility tool names. Bridgeplay writes bridgeplay-proton-*; builds before 3.0
+// wrote notproton-*, and those folders stay Bridgeplay's until BrandMigration renames them.
+// Steam maps Cloud's Windows path roots into the prefix only for a tool whose name contains
+// "proton" (see dylib/feats/compat.c), so both prefixes keep it.
enum ToolName {
- static let prefix = "bridgeplay"
+ static let prefix = "bridgeplay-proton"
static let legacyPrefix = "notproton"
- // notproton-winecx-11.17 -> bridgeplay-winecx-11.17, notproton -> bridgeplay. Any other
- // name, including one already migrated, comes back unchanged.
+ // notproton-winecx-11.17 -> bridgeplay-proton-winecx-11.17, notproton -> bridgeplay-proton.
+ // Any other name, including one already migrated, comes back unchanged.
static func migrated(_ name: String) -> String {
guard isLegacy(name) else { return name }
return prefix + name.dropFirst(legacyPrefix.count)
diff --git a/app/Tests/BridgeplayAppTests/BrandNameTests.swift b/app/Tests/BridgeplayAppTests/BrandNameTests.swift
index 1f6fc57..4c0404c 100644
--- a/app/Tests/BridgeplayAppTests/BrandNameTests.swift
+++ b/app/Tests/BridgeplayAppTests/BrandNameTests.swift
@@ -6,29 +6,30 @@ import Testing
@Suite("Bridgeplay names and the ones before 3.0")
struct BrandNameTests {
- @Test("A legacy tool name maps to its bridgeplay spelling; any other name is unchanged")
+ @Test("A legacy tool name maps to its bridgeplay-proton spelling; any other name is unchanged")
func migratesToolNames() {
- #expect(ToolName.migrated("notproton") == "bridgeplay")
- #expect(ToolName.migrated("notproton-winecx-11.17") == "bridgeplay-winecx-11.17")
- #expect(ToolName.migrated("notproton-fex-rosetta-41073") == "bridgeplay-fex-rosetta-41073")
- #expect(ToolName.migrated("bridgeplay-winecx") == "bridgeplay-winecx")
+ #expect(ToolName.migrated("notproton") == "bridgeplay-proton")
+ #expect(ToolName.migrated("notproton-winecx-11.17") == "bridgeplay-proton-winecx-11.17")
+ #expect(ToolName.migrated("notproton-fex-rosetta-41073") == "bridgeplay-proton-fex-rosetta-41073")
+ #expect(ToolName.migrated("bridgeplay-proton-winecx") == "bridgeplay-proton-winecx")
#expect(ToolName.migrated("GE-Proton9-1") == "GE-Proton9-1")
#expect(ToolName.migrated("proton-notproton") == "proton-notproton")
}
@Test("Both spellings are Bridgeplay's tools, nothing else is")
func recognisesBothPrefixes() {
- #expect(ToolName.isOurs("bridgeplay"))
- #expect(ToolName.isOurs("bridgeplay-winecx-11.17"))
+ #expect(ToolName.isOurs("bridgeplay-proton"))
+ #expect(!ToolName.isOurs("bridgeplay"))
+ #expect(ToolName.isOurs("bridgeplay-proton-winecx-11.17"))
#expect(ToolName.isOurs("notproton"))
#expect(ToolName.isOurs("notproton-26.3"))
#expect(!ToolName.isOurs("GE-Proton9-1"))
#expect(!ToolName.isOurs("proton_9"))
#expect(ToolName.isLegacy("notproton-winecx"))
- #expect(!ToolName.isLegacy("bridgeplay-winecx"))
+ #expect(!ToolName.isLegacy("bridgeplay-proton-winecx"))
}
- @Test("Every tool Bridgeplay serves is named bridgeplay")
+ @Test("Every tool Bridgeplay serves is named bridgeplay-proton, so Steam Cloud maps its saves")
func servedToolsUseTheNewPrefix() {
let names = SupportedRunners.all.flatMap(\.tools).map(\.name)
+ FreeEngineWinecx.current.runner.tools.map(\.name)
@@ -37,6 +38,7 @@ struct BrandNameTests {
#expect(!names.isEmpty)
for name in names {
#expect(name.hasPrefix(ToolName.prefix), "\(name)")
+ #expect(name.contains("proton"), "\(name)")
}
}
diff --git a/app/Tests/BridgeplayAppTests/DetectionTests.swift b/app/Tests/BridgeplayAppTests/DetectionTests.swift
index b6de34d..8040c5c 100644
--- a/app/Tests/BridgeplayAppTests/DetectionTests.swift
+++ b/app/Tests/BridgeplayAppTests/DetectionTests.swift
@@ -124,7 +124,7 @@ struct CompatToolOrderTests {
let tools = SupportedRunners.tools(for: [
try build("26.3.0.39832"), try build("27.0.0.40921-fex"),
])
- #expect(tools.map(\.name) == ["bridgeplay-fex", "bridgeplay-fex-rosetta", "bridgeplay-26.3"])
+ #expect(tools.map(\.name) == ["bridgeplay-proton-fex", "bridgeplay-proton-fex-rosetta", "bridgeplay-proton-26.3"])
#expect(tools.map(\.build) == ["27.0.0.40921-fex", "27.0.0.40921-fex", "26.3.0.39832"])
}
@@ -132,9 +132,9 @@ struct CompatToolOrderTests {
func noFEX() throws {
let builds = [try build("27.0.0.41069-fex"), try build("26.3.0.39832")]
let fresh = SupportedRunners.tools(for: builds, fexAvailable: false)
- #expect(fresh.map(\.name) == ["bridgeplay-fex-rosetta-41069", "bridgeplay-26.3"])
- let kept = SupportedRunners.tools(for: builds, fexAvailable: false, keeping: ["bridgeplay-fex-41069"])
- #expect(kept.map(\.name) == ["bridgeplay-fex-41069", "bridgeplay-fex-rosetta-41069", "bridgeplay-26.3"])
+ #expect(fresh.map(\.name) == ["bridgeplay-proton-fex-rosetta-41069", "bridgeplay-proton-26.3"])
+ let kept = SupportedRunners.tools(for: builds, fexAvailable: false, keeping: ["bridgeplay-proton-fex-41069"])
+ #expect(kept.map(\.name) == ["bridgeplay-proton-fex-41069", "bridgeplay-proton-fex-rosetta-41069", "bridgeplay-proton-26.3"])
}
@Test("Each Preview keeps its own tools when both are set up")
@@ -142,7 +142,7 @@ struct CompatToolOrderTests {
let tools = SupportedRunners.tools(for: [
try build("27.0.0.40921-fex"), try build("27.0.0.40921"),
])
- #expect(tools.map(\.name) == ["bridgeplay-fex", "bridgeplay-fex-rosetta", "bridgeplay-preview"])
+ #expect(tools.map(\.name) == ["bridgeplay-proton-fex", "bridgeplay-proton-fex-rosetta", "bridgeplay-proton-preview"])
#expect(tools.map(\.build) == ["27.0.0.40921-fex", "27.0.0.40921-fex", "27.0.0.40921"])
#expect(Set(tools.map(\.display)).count == tools.count)
}
@@ -150,7 +150,7 @@ struct CompatToolOrderTests {
@Test("The Rosetta-only Preview can hold the legacy name")
func rosettaPreviewAlone() throws {
let tools = SupportedRunners.tools(for: [try build("27.0.0.40921")], legacy: .build("27.0.0.40921"))
- #expect(tools.map(\.name) == ["bridgeplay"])
+ #expect(tools.map(\.name) == ["bridgeplay-proton"])
#expect(tools.first?.tool.flavor == .rosetta)
}
@@ -158,21 +158,17 @@ struct CompatToolOrderTests {
func explicitHolder() throws {
let builds = [try build("27.0.0.40921-fex"), try build("27.0.0.40921")]
let held = SupportedRunners.tools(for: builds, legacy: .build("27.0.0.40921"))
- #expect(held.map(\.name) == ["bridgeplay", "bridgeplay-fex", "bridgeplay-fex-rosetta"])
+ #expect(held.map(\.name) == ["bridgeplay-proton", "bridgeplay-proton-fex", "bridgeplay-proton-fex-rosetta"])
#expect(held.first?.build == "27.0.0.40921")
let none = SupportedRunners.tools(for: builds, legacy: .nobody)
- #expect(none.map(\.name) == ["bridgeplay-fex", "bridgeplay-fex-rosetta", "bridgeplay-preview"])
+ #expect(none.map(\.name) == ["bridgeplay-proton-fex", "bridgeplay-proton-fex-rosetta", "bridgeplay-proton-preview"])
}
@Test("Every tool name is one the dylib accepts")
func namesParse() {
for tool in SupportedRunners.all.flatMap(\.tools) {
- #expect(tool.name.hasPrefix("bridgeplay"))
- // dylib/feats/compat.c: Steam maps Cloud's Windows path roots into the prefix only
- // for a tool whose name contains "proton". The bridgeplay-* names do not.
- withKnownIssue("bridgeplay-* tool names lack \"proton\", which Steam AutoCloud keys on") {
- #expect(tool.name.contains("proton"))
- }
+ #expect(tool.name.hasPrefix("bridgeplay-proton"))
+ #expect(tool.name.contains("proton"))
#expect(tool.name.allSatisfy { $0.isLetter || $0.isNumber || "._-".contains($0) })
#expect(!tool.display.contains { "\"\\".contains($0) || $0.isNewline })
}
@@ -182,7 +178,7 @@ struct CompatToolOrderTests {
func contents() throws {
let tools = SupportedRunners.tools(for: [try build("26.3.0.39832")])
#expect(CompatToolList.contents(tools)
- == "bridgeplay-26.3\t26.3.0.39832\trosetta\tCrossOver 26.3\n")
+ == "bridgeplay-proton-26.3\t26.3.0.39832\trosetta\tCrossOver 26.3\n")
}
}
diff --git a/app/Tests/BridgeplayAppTests/FreeEngineWinecxTests.swift b/app/Tests/BridgeplayAppTests/FreeEngineWinecxTests.swift
index 4e62977..f08827f 100644
--- a/app/Tests/BridgeplayAppTests/FreeEngineWinecxTests.swift
+++ b/app/Tests/BridgeplayAppTests/FreeEngineWinecxTests.swift
@@ -28,24 +28,24 @@ struct FreeEngineWinecxTests {
#expect(release.bundleName == "\(build.releaseVersion).app")
}
- @Test("11.17 is the current release with its own tool; 11.15 keeps bridgeplay-winecx")
+ @Test("11.17 is the current release with its own tool; 11.15 keeps bridgeplay-proton-winecx")
func currentAndPrevious() throws {
#expect(FreeEngineWinecx.current.build == "winecx-11.17")
#expect(FreeEngineWinecx.previous.build == "winecx-11.15")
#expect(FreeEngineWinecx.runnerBuild == FreeEngineWinecx.current.runner)
- #expect(FreeEngineWinecx.current.runner.tools.map(\.name) == ["bridgeplay-winecx-11.17"])
- #expect(FreeEngineWinecx.previous.runner.tools.map(\.name) == ["bridgeplay-winecx"])
+ #expect(FreeEngineWinecx.current.runner.tools.map(\.name) == ["bridgeplay-proton-winecx-11.17"])
+ #expect(FreeEngineWinecx.previous.runner.tools.map(\.name) == ["bridgeplay-proton-winecx"])
let current = FreeEngineWinecx.current.runner
let previous = FreeEngineWinecx.previous.runner
- // Installing 11.17 adds a tool and never moves bridgeplay-winecx, which every
+ // Installing 11.17 adds a tool and never moves bridgeplay-proton-winecx, which every
// existing prefix's build record ties to winecx-11.15. 11.17 lists first, so it is
// what games without a mapping get.
let both = SupportedRunners.tools(for: [current, previous])
- #expect(both.map(\.name) == ["bridgeplay-winecx-11.17", "bridgeplay-winecx"])
+ #expect(both.map(\.name) == ["bridgeplay-proton-winecx-11.17", "bridgeplay-proton-winecx"])
#expect(both.map(\.build) == ["winecx-11.17", "winecx-11.15"])
#expect(SupportedRunners.tools(for: [previous]).map(\.build) == ["winecx-11.15"])
- #expect(SupportedRunners.tools(for: [current]).map(\.name) == ["bridgeplay-winecx-11.17"])
+ #expect(SupportedRunners.tools(for: [current]).map(\.name) == ["bridgeplay-proton-winecx-11.17"])
}
@Test("Both free engines stay separate builds with their own loaders and tools")
diff --git a/app/Tests/BridgeplayAppTests/PrefixToolsTests.swift b/app/Tests/BridgeplayAppTests/PrefixToolsTests.swift
index da2b55d..62c8a63 100644
--- a/app/Tests/BridgeplayAppTests/PrefixToolsTests.swift
+++ b/app/Tests/BridgeplayAppTests/PrefixToolsTests.swift
@@ -1576,13 +1576,13 @@ struct PrefixLastBuildTests {
to: prefix.root.appending(path: PrefixTools.buildRecordName), atomically: true, encoding: .utf8)
let fexOnly = [InstalledTool(
- tool: CompatTool(name: "bridgeplay", flavor: .fex, display: "CrossOver Preview (FEX)"),
+ tool: CompatTool(name: "bridgeplay-proton", flavor: .fex, display: "CrossOver Preview (FEX)"),
build: Self.preview)]
#expect(PrefixTools.tool(for: prefix, among: fexOnly, runners: runners) == nil)
let fex = try #require(SupportedRunners.all.first { $0.id == Self.preview })
let both = SupportedRunners.tools(for: [fex])
- #expect(PrefixTools.tool(for: prefix, among: both, runners: runners)?.name == "bridgeplay-fex-rosetta")
+ #expect(PrefixTools.tool(for: prefix, among: both, runners: runners)?.name == "bridgeplay-proton-fex-rosetta")
}
@Test("A prefix another CrossOver updated gets no tool, so nothing runs over it")
diff --git a/app/Tests/BridgeplayAppTests/RunnerSwitchTests.swift b/app/Tests/BridgeplayAppTests/RunnerSwitchTests.swift
index b06af2f..0d8483f 100644
--- a/app/Tests/BridgeplayAppTests/RunnerSwitchTests.swift
+++ b/app/Tests/BridgeplayAppTests/RunnerSwitchTests.swift
@@ -108,7 +108,7 @@ struct RunnerPrepareTests {
#expect(toolList(runners) == CompatToolList.contents(
SupportedRunners.tools(for: [Self.release, Self.fex])
))
- #expect(toolList(runners)?.hasPrefix("bridgeplay-fex\t27.0.0.40921-fex\tfex\t") == true)
+ #expect(toolList(runners)?.hasPrefix("bridgeplay-proton-fex\t27.0.0.40921-fex\tfex\t") == true)
let again = try prepare(Self.release, runners: runners, calls: calls)
#expect(!again.toolsChanged)
@@ -216,7 +216,7 @@ struct RunnerPrepareTests {
defer { try? FileManager.default.removeItem(at: runners) }
let fm = FileManager.default
let compat = runners.appending(path: "compatibilitytools.d")
- for name in ["bridgeplay-gone", "GE-Proton"] {
+ for name in ["bridgeplay-proton-gone", "GE-Proton"] {
try fm.createDirectory(at: compat.appending(path: name), withIntermediateDirectories: true)
try Data("#!/bin/sh\n".utf8).write(to: compat.appending(path: "\(name)/run"))
}
@@ -225,7 +225,7 @@ struct RunnerPrepareTests {
let kept = try #require(toolList(runners)).split(separator: "\n").compactMap { $0.split(separator: "\t").first }
#expect(!kept.isEmpty)
- #expect(!fm.fileExists(atPath: compat.appending(path: "bridgeplay-gone").path(percentEncoded: false)))
+ #expect(!fm.fileExists(atPath: compat.appending(path: "bridgeplay-proton-gone").path(percentEncoded: false)))
#expect(fm.fileExists(atPath: compat.appending(path: "GE-Proton").path(percentEncoded: false)))
}
@@ -248,7 +248,7 @@ struct RunnerPrepareTests {
}
let listed = try #require(toolList(runners)).split(separator: "\n").compactMap { $0.split(separator: "\t").first }
#expect(!listed.isEmpty)
- #expect(listed.allSatisfy { $0.hasPrefix("bridgeplay") })
+ #expect(listed.allSatisfy { $0.hasPrefix("bridgeplay-proton") })
}
@Test("A tool list written before 3.0 still names the legacy holder")
@@ -272,7 +272,7 @@ struct RunnerPrepareTests {
private func holder(_ runners: URL) -> String? {
toolList(runners)?.split(separator: "\n").map { $0.split(separator: "\t") }
- .first { $0.first == "bridgeplay" }.map { String($0[1]) }
+ .first { $0.first == "bridgeplay-proton" }.map { String($0[1]) }
}
@Test("A 1.0 install keeps the legacy name on the build runners/current pointed at")
@@ -290,7 +290,7 @@ struct RunnerPrepareTests {
try sync(runners)
#expect(holder(runners) == Self.rosetta.id)
- #expect(toolList(runners)?.contains("bridgeplay-fex\t\(Self.fex.id)\tfex\t") == true)
+ #expect(toolList(runners)?.contains("bridgeplay-proton-fex\t\(Self.fex.id)\tfex\t") == true)
}
@Test("Without FEX support a 1.0 FEX install keeps its legacy name")
@@ -331,8 +331,8 @@ struct RunnerPrepareTests {
)
try sync(runners)
#expect(holder(runners) == Self.fex.id)
- #expect(toolList(runners)?.contains("bridgeplay-preview\t\(Self.rosetta.id)\t") == true)
- #expect(toolList(runners)?.contains("bridgeplay-fex-rosetta\t\(Self.fex.id)\t") == true)
+ #expect(toolList(runners)?.contains("bridgeplay-proton-preview\t\(Self.rosetta.id)\t") == true)
+ #expect(toolList(runners)?.contains("bridgeplay-proton-fex-rosetta\t\(Self.fex.id)\t") == true)
}
@Test("A fresh install gives the legacy name to nobody")
@@ -342,8 +342,8 @@ struct RunnerPrepareTests {
try sync(runners)
#expect(holder(runners) == nil)
- #expect(toolList(runners)?.hasPrefix("bridgeplay-fex-41069\t\(Self.fex41069.id)\tfex\t") == true)
- #expect(toolList(runners)?.contains("bridgeplay-preview-41069\t\(Self.preview41069.id)\t") == true)
+ #expect(toolList(runners)?.hasPrefix("bridgeplay-proton-fex-41069\t\(Self.fex41069.id)\tfex\t") == true)
+ #expect(toolList(runners)?.contains("bridgeplay-proton-preview-41069\t\(Self.preview41069.id)\t") == true)
}
@Test("A 1.0.3 install keeps the legacy name on 41069")
@@ -359,7 +359,7 @@ struct RunnerPrepareTests {
#expect(holder(runners) == Self.preview41069.id)
try sync(runners)
#expect(holder(runners) == Self.preview41069.id)
- #expect(toolList(runners)?.contains("bridgeplay-fex-41069\t\(Self.fex41069.id)\tfex\t") == true)
+ #expect(toolList(runners)?.contains("bridgeplay-proton-fex-41069\t\(Self.fex41069.id)\tfex\t") == true)
}
@Test("A Preview listed under its own name does not take the legacy name later")
diff --git a/app/Tests/BridgeplayAppTests/SteamDefaultToolTests.swift b/app/Tests/BridgeplayAppTests/SteamDefaultToolTests.swift
index 44af13a..2a469f6 100644
--- a/app/Tests/BridgeplayAppTests/SteamDefaultToolTests.swift
+++ b/app/Tests/BridgeplayAppTests/SteamDefaultToolTests.swift
@@ -37,8 +37,8 @@ struct SteamDefaultToolTests {
@Test("Adds CompatToolMapping with the default when Steam has none")
func addsMapping() throws {
let text = Self.head + "\n\t\t\t\t\"SentryFile\"\t\t\"x\"\n" + Self.tail
- let result = try #require(SteamDefaultTool.updated(text, tool: "bridgeplay-winecx-11.17"))
- #expect(result == Self.head + "\n\t\t\t\t\"CompatToolMapping\"\n\t\t\t\t{\n" + Self.entry("bridgeplay-winecx-11.17")
+ let result = try #require(SteamDefaultTool.updated(text, tool: "bridgeplay-proton-winecx-11.17"))
+ #expect(result == Self.head + "\n\t\t\t\t\"CompatToolMapping\"\n\t\t\t\t{\n" + Self.entry("bridgeplay-proton-winecx-11.17")
+ "\n\t\t\t\t}\n\t\t\t\t\"SentryFile\"\t\t\"x\"\n" + Self.tail)
}
diff --git a/app/Tests/BridgeplayAppTests/UninstallTests.swift b/app/Tests/BridgeplayAppTests/UninstallTests.swift
index a32ea09..7d778a5 100644
--- a/app/Tests/BridgeplayAppTests/UninstallTests.swift
+++ b/app/Tests/BridgeplayAppTests/UninstallTests.swift
@@ -36,7 +36,7 @@ struct UninstallTests {
var compatTools: [URL] {
SupportPaths.Steam.ourTools(in: compatTool.deletingLastPathComponent())
}
- var secondTool: URL { compatTool.deletingLastPathComponent().appending(path: "bridgeplay-26.3") }
+ var secondTool: URL { compatTool.deletingLastPathComponent().appending(path: "bridgeplay-proton-26.3") }
var foreignTool: URL { compatTool.deletingLastPathComponent().appending(path: "GE-Proton9-1") }
var outerPlist: URL { app.appending(path: "Contents/Info.plist") }
@@ -54,14 +54,14 @@ struct UninstallTests {
let macOS = app.appending(path: "Contents/MacOS")
let inner = root.appending(path: "inner")
let legacyCompat = inner.appending(path: "legacycompat")
- // Named as before 3.0, beside bridgeplay-26.3: uninstalling removes both spellings.
+ // Named as before 3.0, beside bridgeplay-proton-26.3: uninstalling removes both spellings.
let compatTool = root.appending(path: "compatibilitytools.d/notproton")
let support = root.appending(path: "bridgeplay")
let caches = root.appending(path: "valve-packages")
let tools = compatTool.deletingLastPathComponent()
for dir in [macOS, inner, legacyCompat, compatTool, support, caches,
- tools.appending(path: "bridgeplay-26.3"), tools.appending(path: "GE-Proton9-1")] {
+ tools.appending(path: "bridgeplay-proton-26.3"), tools.appending(path: "GE-Proton9-1")] {
try files.createDirectory(at: dir, withIntermediateDirectories: true)
}