Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
feat(app)!: rename the app to Bridgeplay on disk and in Steam
raymondchins1ef44c5fca19
diff --git a/.gitignore b/.gitignoreindex 16ebfc1..07f6a56 100644--- a/.gitignore+++ b/.gitignore@@ -5,7 +5,7 @@ out/*.a*.dylib# The x86_64 SDL2 FreeEngineWinecx installs for winebus.so (docs/WINECX.md).-!app/Sources/NotProtonApp/Resources/libSDL2-2.0.0.dylib+!app/Sources/BridgeplayApp/Resources/libSDL2-2.0.0.dylib.DS_Storevendor/dobby/@@ -23,7 +23,7 @@ xcuserdata/*.xcuserstateDerivedData/-app/Sources/NotProtonApp/Resources/payload/+app/Sources/BridgeplayApp/Resources/payload/__pycache__/installer/Bridgeplay.app/installer/gptk/diff --git a/Makefile b/Makefileindex 1d5cede..9adc04e 100644--- a/Makefile+++ b/Makefile@@ -73,7 +73,7 @@ DEPS := $(OBJS:.o=.d)compatsvc-check shortcutcheck scriptcheck envcheck buildcheck settingscheck routecheck bridgecheck gamedrivecheck \gamefixescheck launchercheck padcheck launch-shell activatecheck FORCE-APP_PAYLOAD := app/Sources/NotProtonApp/Resources/payload+APP_PAYLOAD := app/Sources/BridgeplayApp/Resources/payloadall: $(TARGET) $(APP_PAYLOAD)@@ -146,8 +146,8 @@ mincheck:.PHONY: l10ncheckl10ncheck:@bin=$$(swift build --package-path app -c release --show-bin-path); \- python3 dylib/tests/l10ncheck.py app/Sources/NotProtonApp/Resources/Localization/Localizable.xcstrings \- "$$bin/../../Intermediates.noindex/NotProtonApp.build/$$(basename "$$bin")" zh-Hans it+ python3 dylib/tests/l10ncheck.py app/Sources/BridgeplayApp/Resources/Localization/Localizable.xcstrings \+ "$$bin/../../Intermediates.noindex/BridgeplayApp.build/$$(basename "$$bin")" zh-Hans it# runcheck owns compat_run.sh, whose warnings wait for a change that can move# the embedded __text baseline@@ -425,7 +425,7 @@ $(RUN_SCRIPT_H): dylib/feats/compat_run.sh dylib/embed_script.py$(OUT_DIR)/dylib/feats/compat.o: $(RUN_SCRIPT_H)-SUPPORT_DIR := $(HOME)/Library/Application Support/notproton+SUPPORT_DIR := $(HOME)/Library/Application Support/bridgeplayOVERLAY_SHIM_SRC := overlay-shim/overlay_shim.mOVERLAY_SHIM_ARM := $(OUT_DIR)/overlay-shim.arm64.dylibOVERLAY_SHIM_X86 := $(OUT_DIR)/overlay-shim.x86_64.dylib@@ -710,7 +710,7 @@ app-payload: $(TARGET) $(OVERLAY_SHIM) $(ICONMAKER) $(APPINFO) $(GAME_HOST) $(GA@echo "==> Staged app payload in $(APP_PAYLOAD)"APP_BUNDLE := $(OUT_DIR)/Bridgeplay.app-APP_BUNDLE_PAYLOAD := $(APP_BUNDLE)/Contents/Resources/NotProtonApp_NotProtonApp.bundle/Contents/Resources/payload+APP_BUNDLE_PAYLOAD := $(APP_BUNDLE)/Contents/Resources/BridgeplayApp_BridgeplayApp.bundle/Contents/Resources/payloadAPP_ZIP := $(OUT_DIR)/Bridgeplay.zip# dylib/version.h: Bridgeplay semver for CFBundleShortVersionString, the release counter# for CFBundleVersion (Sparkle orders updates by it; 32 is newer than the old 1.1.9.31),@@ -762,19 +762,19 @@ app: app-payload $(ICON_CAR)"Set :CFBundleVersion $(APP_BUILD)" -c \"Set :NotProtonVersion $(APP_UPSTREAM)" \"$(APP_BUNDLE)/Contents/Info.plist"- cp "$$(swift build --package-path app -c release --show-bin-path)/NotProtonApp" \- "$(APP_BUNDLE)/Contents/MacOS/NotProtonApp"+ cp "$$(swift build --package-path app -c release --show-bin-path)/BridgeplayApp" \+ "$(APP_BUNDLE)/Contents/MacOS/BridgeplayApp"@mkdir -p "$(APP_BUNDLE)/Contents/Frameworks"ditto "$$(swift build --package-path app -c release --show-bin-path)/Sparkle.framework" \"$(APP_BUNDLE)/Contents/Frameworks/Sparkle.framework"install_name_tool -add_rpath @executable_path/../Frameworks \- "$(APP_BUNDLE)/Contents/MacOS/NotProtonApp"+ "$(APP_BUNDLE)/Contents/MacOS/BridgeplayApp"xcrun vtool -set-build-version macos $(MIN_VER) "$$(xcrun --sdk macosx --show-sdk-version)" \- -replace -output "$(APP_BUNDLE)/Contents/MacOS/NotProtonApp" \- "$(APP_BUNDLE)/Contents/MacOS/NotProtonApp"- cp -R "$$(swift build --package-path app -c release --show-bin-path)/NotProtonApp_NotProtonApp.bundle" \+ -replace -output "$(APP_BUNDLE)/Contents/MacOS/BridgeplayApp" \+ "$(APP_BUNDLE)/Contents/MacOS/BridgeplayApp"+ cp -R "$$(swift build --package-path app -c release --show-bin-path)/BridgeplayApp_BridgeplayApp.bundle" \"$(APP_BUNDLE)/Contents/Resources/"- cp -R "$(APP_BUNDLE)/Contents/Resources/NotProtonApp_NotProtonApp.bundle/Contents/Resources/"*.lproj \+ cp -R "$(APP_BUNDLE)/Contents/Resources/BridgeplayApp_BridgeplayApp.bundle/Contents/Resources/"*.lproj \"$(APP_BUNDLE)/Contents/Resources/"cp "$(ICON_DIR)/Assets.car" "$(ICON_DIR)/$(ICON_NAME).icns" \"$(APP_BUNDLE)/Contents/Resources/"@@ -792,7 +792,7 @@ app: app-payload $(ICON_CAR)@echo "==> Payload complete in the bundle"codesign -f -s "$(APP_SIGN_ID)" "$(APP_BUNDLE)"codesign --verify --strict "$(APP_BUNDLE)"- @echo "==> Built $(APP_BUNDLE) ($(APP_VERSION) build $(APP_BUILD), NotProton $(APP_UPSTREAM))"+ @echo "==> Built $(APP_BUNDLE) ($(APP_VERSION) build $(APP_BUILD), based on NotProton $(APP_UPSTREAM))"app-zip: apprm -f "$(APP_ZIP)"@@ -810,7 +810,7 @@ FORCE:# np-native: Steam launch-option wrapper for native macOS games (arm64# preferred, Steam's DYLD_INSERT_LIBRARIES kept). Installed later to-# ~/.notproton/np-native.+# ~/.bridgeplay/np-native.NP_NATIVE := $(OUT_DIR)/np-native/np-nativeNP_NATIVE_SRC := native-launch/np-native.cdiff --git a/app/Info.plist b/app/Info.plistindex 698ca29..22813fa 100644--- a/app/Info.plist+++ b/app/Info.plist@@ -11,7 +11,7 @@<string>zh-Hans</string></array><key>CFBundleExecutable</key>- <string>NotProtonApp</string>+ <string>BridgeplayApp</string><key>CFBundleIconFile</key><string>Bridgeplay</string><key>CFBundleIconName</key>diff --git a/app/Package.swift b/app/Package.swiftindex 8bc621a..4fe3a8b 100644--- a/app/Package.swift+++ b/app/Package.swift@@ -1,8 +1,8 @@// swift-tools-version: 6.2import Foundationimport PackageDescription-let testsPath = "Tests/NotProtonAppTests"-let payloadPath = "Sources/NotProtonApp/Resources/payload"+let testsPath = "Tests/BridgeplayAppTests"+let payloadPath = "Sources/BridgeplayApp/Resources/payload"let packageRoot = URL(fileURLWithPath: #filePath).deletingLastPathComponent()let hasTests = FileManager.default.fileExists(atPath: packageRoot.appendingPathComponent(testsPath).path)@@ -13,7 +13,7 @@ let hasTests = FileManager.default.fileExists(let hasPayload = FileManager.default.fileExists(atPath: packageRoot.appendingPathComponent(payloadPath).path)let package = Package(- name: "NotProtonApp",+ name: "BridgeplayApp",defaultLocalization: "en",platforms: [.macOS("15.0")],dependencies: [@@ -21,9 +21,9 @@ let package = Package(],targets: [.executableTarget(- name: "NotProtonApp",+ name: "BridgeplayApp",dependencies: [.product(name: "Sparkle", package: "Sparkle")],- path: "Sources/NotProtonApp",+ path: "Sources/BridgeplayApp",resources: (hasPayload ? [.copy("Resources/payload")] : []) + [.process("Resources/Localization"),.copy("Resources/Fonts"),@@ -71,8 +71,8 @@ let package = Package(),] + (hasTests ? [.testTarget(- name: "NotProtonAppTests",- dependencies: ["NotProtonApp"],+ name: "BridgeplayAppTests",+ dependencies: ["BridgeplayApp"],path: testsPath),] : [])diff --git a/app/Sources/NotProtonApp/App.swift b/app/Sources/BridgeplayApp/App.swiftsimilarity index 99%rename from app/Sources/NotProtonApp/App.swiftrename to app/Sources/BridgeplayApp/App.swiftindex 1a6239b..7434202 100644--- a/app/Sources/NotProtonApp/App.swift+++ b/app/Sources/BridgeplayApp/App.swift@@ -2,7 +2,7 @@import SwiftUI-struct NotProtonApp: App {+struct BridgeplayApp: App {@State private var status = SystemStatus()@State private var prefixes = PrefixesModel()diff --git a/app/Sources/NotProtonApp/Model/BridgePayload.swift b/app/Sources/BridgeplayApp/Model/BridgePayload.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/BridgePayload.swiftrename to app/Sources/BridgeplayApp/Model/BridgePayload.swiftdiff --git a/app/Sources/NotProtonApp/Model/CrossOverLicense.swift b/app/Sources/BridgeplayApp/Model/CrossOverLicense.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/CrossOverLicense.swiftrename to app/Sources/BridgeplayApp/Model/CrossOverLicense.swiftdiff --git a/app/Sources/NotProtonApp/Model/CrossOverRow.swift b/app/Sources/BridgeplayApp/Model/CrossOverRow.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/CrossOverRow.swiftrename to app/Sources/BridgeplayApp/Model/CrossOverRow.swiftdiff --git a/app/Sources/NotProtonApp/Model/CrossOverSource.swift b/app/Sources/BridgeplayApp/Model/CrossOverSource.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/CrossOverSource.swiftrename to app/Sources/BridgeplayApp/Model/CrossOverSource.swiftdiff --git a/app/Sources/NotProtonApp/Model/DeploymentContent.swift b/app/Sources/BridgeplayApp/Model/DeploymentContent.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/DeploymentContent.swiftrename to app/Sources/BridgeplayApp/Model/DeploymentContent.swiftdiff --git a/app/Sources/NotProtonApp/Model/FreeEngine.swift b/app/Sources/BridgeplayApp/Model/FreeEngine.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/FreeEngine.swiftrename to app/Sources/BridgeplayApp/Model/FreeEngine.swiftdiff --git a/app/Sources/NotProtonApp/Model/FreeEngineWinecx.swift b/app/Sources/BridgeplayApp/Model/FreeEngineWinecx.swiftsimilarity index 98%rename from app/Sources/NotProtonApp/Model/FreeEngineWinecx.swiftrename to app/Sources/BridgeplayApp/Model/FreeEngineWinecx.swiftindex 796a319..0031485 100644--- a/app/Sources/NotProtonApp/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, notproton-winecx-11.17, beside- // the 11.15 release, which keeps notproton-winecx: every existing prefix is claimed by+ // 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// winecx-11.15, so the default tool only moves once 11.17 is verified on real games.static let current = v1117static let previous = v1115@@ -208,7 +208,7 @@ enum FreeEngineWinecx {.i386Windows: "8ad83740df2da5e79ed435e4bc57e82b4b6a4b984fbec73e1160ca81dfce1b44",],tools: [- CompatTool(name: "notproton-winecx-11.17", flavor: .rosetta, display: "WineCX 11.17 (msync, D3DMetal)"),+ CompatTool(name: "bridgeplay-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 notproton-winecx tool.+ // Whisky itself downloads. It keeps the bridgeplay-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: "notproton-winecx", flavor: .rosetta, display: "WineCX 11.15 (msync, D3DMetal)"),+ CompatTool(name: "bridgeplay-winecx", flavor: .rosetta, display: "WineCX 11.15 (msync, D3DMetal)"),],isFree: true),diff --git a/app/Sources/NotProtonApp/Model/FreeEngineWinecxD3DMetal.swift b/app/Sources/BridgeplayApp/Model/FreeEngineWinecxD3DMetal.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/FreeEngineWinecxD3DMetal.swiftrename to app/Sources/BridgeplayApp/Model/FreeEngineWinecxD3DMetal.swiftdiff --git a/app/Sources/NotProtonApp/Model/InstallPayload.swift b/app/Sources/BridgeplayApp/Model/InstallPayload.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/InstallPayload.swiftrename to app/Sources/BridgeplayApp/Model/InstallPayload.swiftdiff --git a/app/Sources/NotProtonApp/Model/InstallScriptMarkers.swift b/app/Sources/BridgeplayApp/Model/InstallScriptMarkers.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/InstallScriptMarkers.swiftrename to app/Sources/BridgeplayApp/Model/InstallScriptMarkers.swiftdiff --git a/app/Sources/NotProtonApp/Model/LocalSigning.swift b/app/Sources/BridgeplayApp/Model/LocalSigning.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/LocalSigning.swiftrename to app/Sources/BridgeplayApp/Model/LocalSigning.swiftdiff --git a/app/Sources/NotProtonApp/Model/NtdllPatcher.swift b/app/Sources/BridgeplayApp/Model/NtdllPatcher.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/NtdllPatcher.swiftrename to app/Sources/BridgeplayApp/Model/NtdllPatcher.swiftdiff --git a/app/Sources/NotProtonApp/Model/PayloadManifest.swift b/app/Sources/BridgeplayApp/Model/PayloadManifest.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/PayloadManifest.swiftrename to app/Sources/BridgeplayApp/Model/PayloadManifest.swiftdiff --git a/app/Sources/NotProtonApp/Model/PayloadState.swift b/app/Sources/BridgeplayApp/Model/PayloadState.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/PayloadState.swiftrename to app/Sources/BridgeplayApp/Model/PayloadState.swiftdiff --git a/app/Sources/NotProtonApp/Model/PrefixPrompt.swift b/app/Sources/BridgeplayApp/Model/PrefixPrompt.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/PrefixPrompt.swiftrename to app/Sources/BridgeplayApp/Model/PrefixPrompt.swiftdiff --git a/app/Sources/NotProtonApp/Model/PrefixRebuild.swift b/app/Sources/BridgeplayApp/Model/PrefixRebuild.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/PrefixRebuild.swiftrename to app/Sources/BridgeplayApp/Model/PrefixRebuild.swiftdiff --git a/app/Sources/NotProtonApp/Model/PrefixStore.swift b/app/Sources/BridgeplayApp/Model/PrefixStore.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/PrefixStore.swiftrename to app/Sources/BridgeplayApp/Model/PrefixStore.swiftdiff --git a/app/Sources/NotProtonApp/Model/PrefixTools.swift b/app/Sources/BridgeplayApp/Model/PrefixTools.swiftsimilarity index 93%rename from app/Sources/NotProtonApp/Model/PrefixTools.swiftrename to app/Sources/BridgeplayApp/Model/PrefixTools.swiftindex f94488e..0feee8e 100644--- a/app/Sources/NotProtonApp/Model/PrefixTools.swift+++ b/app/Sources/BridgeplayApp/Model/PrefixTools.swift@@ -31,15 +31,39 @@ enum PrefixLog: CaseIterable, Sendable {}}+ // compat_run.sh writes bridgeplay-*.log; a prefix last run before 3.0 has notproton-*.log,+ // which is shown until the new one exists.func url(for prefix: WinePrefix, launchers: URL = SupportPaths.launchers) -> URL {+ let folder = switch self {+ case .launch: prefix.root+ case .wine: launchers.appending(path: prefix.appID)+ }+ let current = folder.appending(path: fileName)+ let legacy = folder.appending(path: legacyFileName)+ let files = FileManager.default+ if !files.fileExists(atPath: current.path(percentEncoded: false)),+ files.fileExists(atPath: legacy.path(percentEncoded: false)) {+ return legacy+ }+ return current+ }++ var fileName: String {+ switch self {+ case .launch: "bridgeplay-run.log"+ case .wine: "bridgeplay-wine.log"+ }+ }++ var legacyFileName: String {switch self {- case .launch: prefix.root.appending(path: "notproton-run.log")- case .wine: launchers.appending(path: prefix.appID).appending(path: "notproton-wine.log")+ case .launch: "notproton-run.log"+ case .wine: "notproton-wine.log"}}}-// What compat_run.sh writes to notproton-build when a tool first runs a prefix.+// What compat_run.sh writes to notproton-build (a prefix marker, kept) when a tool first runs a prefix.struct PrefixBuildRecord: Sendable, Equatable {let build: Stringlet display: String?@@ -254,7 +278,7 @@ enum PrefixTools {// Wine truncates vc_redist's 1638 (newer runtime installed) to 102; Winetricks only accepts 236static let winetricksWine = #"""#!/bin/sh- "$NOTPROTON_WINE" "$@"+ "$BRIDGEPLAY_WINE" "$@"status=$?case "$status:${1##*[\\/]}" in102:[Vv][Cc]*[Rr][Ee][Dd][Ii][Ss][Tt]*.[Ee][Xx][Ee]) exit 236 ;;@@ -302,7 +326,7 @@ enum PrefixTools {}defer { claim.release() }let loader = try readyLoader(step: step, prefix: prefix, runner: runner, flavor: flavor)- let wrapper = script.deletingLastPathComponent().appending(path: "notproton-wine")+ let wrapper = script.deletingLastPathComponent().appending(path: "bridgeplay-wine")do {try Data(winetricksWine.utf8).write(to: wrapper, options: .atomic)try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: wrapper.path(percentEncoded: false))@@ -313,7 +337,7 @@ enum PrefixTools {// cabextract comes from the runner's bin, which environment() puts on PATH.var environment = environment(prefix: prefix, runner: runner, flavor: flavor)environment["WINE"] = wrapper.path(percentEncoded: false)- environment["NOTPROTON_WINE"] = loader.path(percentEncoded: false)+ environment["BRIDGEPLAY_WINE"] = loader.path(percentEncoded: false)// Winetricks reads the architecture from WINE_BIN, which would otherwise be the wrapper.environment["WINE_BIN"] = loader.path(percentEncoded: false)diff --git a/app/Sources/NotProtonApp/Model/RunnerInstaller.swift b/app/Sources/BridgeplayApp/Model/RunnerInstaller.swiftsimilarity index 99%rename from app/Sources/NotProtonApp/Model/RunnerInstaller.swiftrename to app/Sources/BridgeplayApp/Model/RunnerInstaller.swiftindex f288255..b4561f6 100644--- a/app/Sources/NotProtonApp/Model/RunnerInstaller.swift+++ b/app/Sources/BridgeplayApp/Model/RunnerInstaller.swift@@ -1,4 +1,4 @@-// Clones CrossOver's Wine runtime into ~/Library/Application Support/notproton/runners+// Clones CrossOver's Wine runtime into ~/Library/Application Support/bridgeplay/runnersimport Darwinimport Foundationdiff --git a/app/Sources/NotProtonApp/Model/RunnerPatcher.swift b/app/Sources/BridgeplayApp/Model/RunnerPatcher.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/RunnerPatcher.swiftrename to app/Sources/BridgeplayApp/Model/RunnerPatcher.swiftdiff --git a/app/Sources/NotProtonApp/Model/RunnerSetup.swift b/app/Sources/BridgeplayApp/Model/RunnerSetup.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/RunnerSetup.swiftrename to app/Sources/BridgeplayApp/Model/RunnerSetup.swiftdiff --git a/app/Sources/NotProtonApp/Model/RunnerStore.swift b/app/Sources/BridgeplayApp/Model/RunnerStore.swiftsimilarity index 92%rename from app/Sources/NotProtonApp/Model/RunnerStore.swiftrename to app/Sources/BridgeplayApp/Model/RunnerStore.swiftindex 8b79a5f..ed5a3e1 100644--- a/app/Sources/NotProtonApp/Model/RunnerStore.swift+++ b/app/Sources/BridgeplayApp/Model/RunnerStore.swift@@ -113,16 +113,16 @@ enum CompatToolList {let builds = RunnerStore.installedBuilds(in: runners)let listed = try? String(contentsOf: file, encoding: .utf8)let holder = legacyHolder(builds: builds, listed: listed, runners: runners)- // On Sequoia a FEX tool stays only if an earlier install listed it.+ // On Sequoia a FEX tool stays only if an earlier install listed it, under either name.var kept = Set((listed ?? "").split(separator: "\n").compactMap {- $0.split(separator: "\t").first.map(String.init)+ $0.split(separator: "\t").first.map { ToolName.migrated(String($0)) }})if case .build = holder { kept.insert(SupportedRunners.legacyToolName) }return (builds, listed, SupportedRunners.tools(for: builds, legacy: holder, fexAvailable: fexAvailable, keeping: kept))}- // 1.0.x used the single 'notproton' tool name and wrote no tool list, so the+ // 1.0.x used the single 'notproton' tool name (now 'bridgeplay') 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@@ -130,7 +130,7 @@ enum CompatToolList {let ids = Set(builds.map(\.id))let rows = (listed ?? "").split(separator: "\n").map { $0.split(separator: "\t").map(String.init) }.filter { $0.count > 1 && ids.contains($0[1]) && SupportedRunners.legacyHolders.contains($0[1]) }- if let held = rows.first(where: { $0[0] == SupportedRunners.legacyToolName }) {+ if let held = rows.first(where: { ToolName.migrated($0[0]) == SupportedRunners.legacyToolName }) {return .build(held[1])}if !rows.isEmpty { return .nobody }@@ -179,7 +179,9 @@ enum CompatToolList {}// A tool whose build is gone (Remove Copy, a dropped engine) would stay in Steam's list// and fail on launch, so every Bridgeplay tool the list no longer names goes too.- for tool in SupportPaths.Steam.notprotonTools(in: compatTools) where !tools.contains(tool.lastPathComponent) {+ // A notproton-* folder is left for BrandMigration: games are still mapped to it.+ for tool in SupportPaths.Steam.ourTools(in: compatTools)+ where !ToolName.isLegacy(tool.lastPathComponent) && !tools.contains(tool.lastPathComponent) {try? FileManager.default.removeItem(at: tool)}}@@ -187,7 +189,7 @@ enum CompatToolList {// Old run scripts read runners/current and bridge/wine/<arch>. Steam keeps running them// until it restarts, so those paths have to keep working until then.static func legacyLayoutInUse(compatTools: URL = SupportPaths.Steam.compatTools) -> Bool {- SupportPaths.Steam.notprotonTools(in: compatTools).contains { tool in+ SupportPaths.Steam.ourTools(in: compatTools).contains { tool inlet run = try? String(contentsOf: tool.appending(path: "run"), encoding: .utf8)return run?.contains("/runners/current") == true}diff --git a/app/Sources/NotProtonApp/Model/SetupChecks.swift b/app/Sources/BridgeplayApp/Model/SetupChecks.swiftsimilarity index 99%rename from app/Sources/NotProtonApp/Model/SetupChecks.swiftrename to app/Sources/BridgeplayApp/Model/SetupChecks.swiftindex e6b2acc..11d5450 100644--- a/app/Sources/NotProtonApp/Model/SetupChecks.swift+++ b/app/Sources/BridgeplayApp/Model/SetupChecks.swift@@ -90,7 +90,7 @@ enum SetupChecks {// Read-only disk image mounts that are always detached again.enum DiskImage {static func withMounted<T>(_ image: URL, _ body: (URL) throws -> T) throws -> T {- let mount = FileManager.default.temporaryDirectory.appending(path: "notproton-\(UUID().uuidString)", directoryHint: .isDirectory)+ let mount = FileManager.default.temporaryDirectory.appending(path: "bridgeplay-\(UUID().uuidString)", directoryHint: .isDirectory)try FileManager.default.createDirectory(at: mount, withIntermediateDirectories: true)defer { try? FileManager.default.removeItem(at: mount) }try Shell.check("/usr/bin/hdiutil", ["attach", "-nobrowse", "-readonly", "-noverify", "-quiet",diff --git a/app/Sources/NotProtonApp/Model/SteamBundle.swift b/app/Sources/BridgeplayApp/Model/SteamBundle.swiftsimilarity index 96%rename from app/Sources/NotProtonApp/Model/SteamBundle.swiftrename to app/Sources/BridgeplayApp/Model/SteamBundle.swiftindex cf88bd5..d3a5cab 100644--- a/app/Sources/NotProtonApp/Model/SteamBundle.swift+++ b/app/Sources/BridgeplayApp/Model/SteamBundle.swift@@ -18,7 +18,9 @@ enum SteamBundle {static let controllerBlockKey = "SDL_JOYSTICK_BLACKLIST_DEVICES"static let controllerBlockValue = "0x05ac/0x0004"- static let plistBackupName = "Info.plist.before-notproton"+ static let plistBackupName = "Info.plist.before-bridgeplay"+ // The backup's name before 3.0. It is the same unmodified Info.plist, so either counts.+ static let legacyPlistBackupName = "Info.plist.before-notproton"static let environmentKey = "LSEnvironment"static var isPresent: Bool {diff --git a/app/Sources/NotProtonApp/Model/SteamDefaultTool.swift b/app/Sources/BridgeplayApp/Model/SteamDefaultTool.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/SteamDefaultTool.swiftrename to app/Sources/BridgeplayApp/Model/SteamDefaultTool.swiftdiff --git a/app/Sources/NotProtonApp/Model/SteamInstaller.swift b/app/Sources/BridgeplayApp/Model/SteamInstaller.swiftsimilarity index 98%rename from app/Sources/NotProtonApp/Model/SteamInstaller.swiftrename to app/Sources/BridgeplayApp/Model/SteamInstaller.swiftindex 13f2383..87edc41 100644--- a/app/Sources/NotProtonApp/Model/SteamInstaller.swift+++ b/app/Sources/BridgeplayApp/Model/SteamInstaller.swift@@ -313,7 +313,7 @@ enum SteamInstaller {static func assertBundleIsWritable(_ app: URL) throws {let directory = app.appending(path: "Contents/MacOS")- let probe = directory.appending(path: ".notproton-write-probe-\(UUID().uuidString)")+ let probe = directory.appending(path: ".bridgeplay-write-probe-\(UUID().uuidString)")do {try Data("probe".utf8).write(to: probe, options: .withoutOverwriting)try FileManager.default.removeItem(at: probe)@@ -343,8 +343,10 @@ enum SteamInstaller {static func backUpPlist(_ plist: URL, into backups: URL) throws -> Bool {let destination = backups.appending(path: SteamBundle.plistBackupName)+ let legacy = backups.appending(path: SteamBundle.legacyPlistBackupName)let files = FileManager.default- guard !files.fileExists(atPath: destination.path(percentEncoded: false)) else { return false }+ guard !files.fileExists(atPath: destination.path(percentEncoded: false)),+ !files.fileExists(atPath: legacy.path(percentEncoded: false)) else { return false }guard files.fileExists(atPath: plist.path(percentEncoded: false)) else { return false }try files.createDirectory(at: backups, withIntermediateDirectories: true)diff --git a/app/Sources/NotProtonApp/Model/SteamModifications.swift b/app/Sources/BridgeplayApp/Model/SteamModifications.swiftsimilarity index 76%rename from app/Sources/NotProtonApp/Model/SteamModifications.swiftrename to app/Sources/BridgeplayApp/Model/SteamModifications.swiftindex 44849fc..316f7d0 100644--- a/app/Sources/NotProtonApp/Model/SteamModifications.swift+++ b/app/Sources/BridgeplayApp/Model/SteamModifications.swift@@ -3,10 +3,13 @@ import Foundationstruct SteamModifications: Sendable {let file: URLlet legacyRecord: URL+ // The same list under its name before 3.0. Read until the first write replaces it.+ var legacyFile: URL?static var shared: Self {- Self(file: SupportPaths.applicationSupport.appending(path: "notproton-steam-bundles.json"),- legacyRecord: DeploymentContent.record(beside: SupportPaths.deployedVersion))+ Self(file: SupportPaths.steamBundlesRecord,+ legacyRecord: DeploymentContent.record(beside: SupportPaths.deployedVersion),+ legacyFile: SupportPaths.legacySteamBundlesRecord)}enum State: Equatable {@@ -14,11 +17,13 @@ struct SteamModifications: Sendable {}func paths() throws -> [URL] {- do {- return try JSONDecoder().decode([String].self, from: Data(contentsOf: file))- .map { URL(filePath: $0, directoryHint: .notDirectory) }- } catch let error as NSError where error.domain == NSCocoaErrorDomain- && [NSFileReadNoSuchFileError, NSFileNoSuchFileError].contains(error.code) {}+ for record in [file, legacyFile].compactMap({ $0 }) {+ do {+ return try JSONDecoder().decode([String].self, from: Data(contentsOf: record))+ .map { URL(filePath: $0, directoryHint: .notDirectory) }+ } catch let error as NSError where error.domain == NSCocoaErrorDomain+ && [NSFileReadNoSuchFileError, NSFileNoSuchFileError].contains(error.code) {}+ }if try DeploymentContent.readBuild(at: legacyRecord) != nil {return [SupportPaths.Steam.defaultApp]}@@ -46,6 +51,8 @@ struct SteamModifications: Sendable {private func write(_ paths: [URL]) throws {let paths = Set(paths.map { $0.standardizedFileURL.path }).sorted()try atomicReplace(file, with: JSONEncoder().encode(paths), step: Uninstall.step)+ // Every write starts from paths(), so the old list is now carried in the new one.+ if let legacyFile { try? FileManager.default.removeItem(at: legacyFile) }}static func inspect(_ app: URL) throws -> State {diff --git a/app/Sources/NotProtonApp/Model/SteamPatchKeeper.swift b/app/Sources/BridgeplayApp/Model/SteamPatchKeeper.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/SteamPatchKeeper.swiftrename to app/Sources/BridgeplayApp/Model/SteamPatchKeeper.swiftdiff --git a/app/Sources/NotProtonApp/Model/SteamRepair.swift b/app/Sources/BridgeplayApp/Model/SteamRepair.swiftsimilarity index 95%rename from app/Sources/NotProtonApp/Model/SteamRepair.swiftrename to app/Sources/BridgeplayApp/Model/SteamRepair.swiftindex 9fc02af..c7cfcf8 100644--- a/app/Sources/NotProtonApp/Model/SteamRepair.swift+++ b/app/Sources/BridgeplayApp/Model/SteamRepair.swift@@ -230,13 +230,16 @@ enum SteamRepair {}static func removeStaleBackup(from backups: URL) throws -> Bool {- let backup = backups.appending(path: SteamBundle.plistBackupName)- let path = backup.path(percentEncoded: false)let files = FileManager.default- guard files.fileExists(atPath: path) else { return false }-- try WriteRefused.catching(path) { try files.removeItem(at: backup) }- return true+ var removed = false+ for name in [SteamBundle.plistBackupName, SteamBundle.legacyPlistBackupName] {+ let backup = backups.appending(path: name)+ let path = backup.path(percentEncoded: false)+ guard files.fileExists(atPath: path) else { continue }+ try WriteRefused.catching(path) { try files.removeItem(at: backup) }+ removed = true+ }+ return removed}static func version(of app: URL) -> String? {diff --git a/app/Sources/NotProtonApp/Model/SupportedRunner.swift b/app/Sources/BridgeplayApp/Model/SupportedRunner.swiftsimilarity index 87%rename from app/Sources/NotProtonApp/Model/SupportedRunner.swiftrename to app/Sources/BridgeplayApp/Model/SupportedRunner.swiftindex 7a35e06..79469e0 100644--- a/app/Sources/NotProtonApp/Model/SupportedRunner.swift+++ b/app/Sources/BridgeplayApp/Model/SupportedRunner.swift@@ -96,15 +96,16 @@ enum SupportedRunners {// First entry is what windows-only games get when Steam has no mapping.static let toolPreference = [- legacyToolName, "notproton-fex", "notproton-fex-rosetta", "notproton-preview",- "notproton-fex-41069", "notproton-fex-rosetta-41069", "notproton-preview-41069",- "notproton-fex-41073", "notproton-fex-rosetta-41073", "notproton-preview-41073", "notproton-26.3", "notproton-winecx-11.17",- "notproton-winecx", "notproton-winehq",+ 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",]- static let legacyToolName = "notproton"+ // The single tool name 1.0.x used, 'notproton' before 3.0.+ static let legacyToolName = "bridgeplay"- // The only builds that can own the 'notproton' tool name.+ // The only builds that can own the 'bridgeplay' 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 {@@ -152,7 +153,7 @@ enum SupportedRunners {.i386Windows: "e641d7b2e81ee13877823494679ba2d87e0d61b8a87e8a1ce92b4fe73631ae74",],tools: [- CompatTool(name: "notproton-26.3", flavor: .rosetta, display: "CrossOver 26.3"),+ CompatTool(name: "bridgeplay-26.3", flavor: .rosetta, display: "CrossOver 26.3"),],rebuilds: [// crossoverchina.com@@ -183,7 +184,7 @@ enum SupportedRunners {.i386Windows: "25bfde1f50ee96485763968ef10b9d9ad35e38214232f17ebdc009b098af44a0",],tools: [- CompatTool(name: "notproton-preview", flavor: .rosetta, display: "CrossOver 2026 08 21-X86 - Rosetta"),+ CompatTool(name: "bridgeplay-preview", flavor: .rosetta, display: "CrossOver 2026 08 21-X86 - Rosetta"),]),RunnerBuild(@@ -202,8 +203,8 @@ enum SupportedRunners {.aarch64Windows: "f40810193a5ef2520774288f354a8604f5ba91828315f643b3ee6688b873dc3f",],tools: [- CompatTool(name: "notproton-fex", flavor: .fex, display: "CrossOver 2026 08 21-ARM64 - FEX"),- CompatTool(name: "notproton-fex-rosetta", flavor: .rosetta, display: "CrossOver 2026 08 21-ARM64 - Rosetta"),+ 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"),]),RunnerBuild(@@ -220,7 +221,7 @@ enum SupportedRunners {.i386Windows: "0d8e3ebb57b3173f675eef5e3a0950052c592efa10a7a10193b0beb811b55ea5",],tools: [- CompatTool(name: "notproton-preview-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-X86 - Rosetta"),+ CompatTool(name: "bridgeplay-preview-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-X86 - Rosetta"),]),RunnerBuild(@@ -239,8 +240,8 @@ enum SupportedRunners {.aarch64Windows: "7623c0b33350f511b431d39c7ec0c0d4f5def4183acef0eee5d4a5c694898956",],tools: [- CompatTool(name: "notproton-fex-41069", flavor: .fex, display: "CrossOver 2026 10 06-ARM64 - FEX"),- CompatTool(name: "notproton-fex-rosetta-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-ARM64 - Rosetta"),+ 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"),]),RunnerBuild(@@ -257,7 +258,7 @@ enum SupportedRunners {.i386Windows: "88f9a1d16dd7127100eab902156390ec2a5ec67770cfddd3fd3f1237c9965309",],tools: [- CompatTool(name: "notproton-winehq", flavor: .rosetta, display: "WineHQ 11.15 - Rosetta"),+ CompatTool(name: "bridgeplay-winehq", flavor: .rosetta, display: "WineHQ 11.15 - Rosetta"),],isFree: true),@@ -275,7 +276,7 @@ enum SupportedRunners {.i386Windows: "7d3df0ee9dd61693293ba74a8d2c588b4dce26fb7f7a78c0c5ed5bdc58869e14",],tools: [- CompatTool(name: "notproton-preview-41073", flavor: .rosetta, display: "CrossOver 2026 10 15-X86 - Rosetta"),+ CompatTool(name: "bridgeplay-preview-41073", flavor: .rosetta, display: "CrossOver 2026 10 15-X86 - Rosetta"),]),RunnerBuild(@@ -294,8 +295,8 @@ enum SupportedRunners {.aarch64Windows: "2efb13f3303adc2c8ee61b93e027e4e94730a2e6b0162c7e6aebd4104200f07c",],tools: [- CompatTool(name: "notproton-fex-41073", flavor: .fex, display: "CrossOver 2026 10 15-ARM64 - FEX"),- CompatTool(name: "notproton-fex-rosetta-41073", flavor: .rosetta, display: "CrossOver 2026 10 15-ARM64 - Rosetta"),+ 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"),]),] + FreeEngineWinecx.runnerBuildsdiff --git a/app/Sources/NotProtonApp/Model/Uninstall.swift b/app/Sources/BridgeplayApp/Model/Uninstall.swiftsimilarity index 98%rename from app/Sources/NotProtonApp/Model/Uninstall.swiftrename to app/Sources/BridgeplayApp/Model/Uninstall.swiftindex d99b7a1..d5db333 100644--- a/app/Sources/NotProtonApp/Model/Uninstall.swift+++ b/app/Sources/BridgeplayApp/Model/Uninstall.swift@@ -58,10 +58,10 @@ enum Uninstall {innerPlist: URL = SupportPaths.Steam.innerInfoPlist,updateBlocks: [URL] = UpdateBlock.paths,legacyCompat: URL = SupportPaths.Steam.legacyCompat,- compatTools: [URL] = SupportPaths.Steam.notprotonTools(),+ compatTools: [URL] = SupportPaths.Steam.ourTools(),directories: [URL] = [SupportPaths.support,- SupportPaths.packageDownloads.deletingLastPathComponent(),+ SupportPaths.caches,],libraries: [SteamLibrary] = PrefixStore.libraries(),modifications: SteamModifications = .shared,diff --git a/app/Sources/NotProtonApp/Model/UpdateBlock.swift b/app/Sources/BridgeplayApp/Model/UpdateBlock.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/UpdateBlock.swiftrename to app/Sources/BridgeplayApp/Model/UpdateBlock.swiftdiff --git a/app/Sources/NotProtonApp/Model/ValveFetcher.swift b/app/Sources/BridgeplayApp/Model/ValveFetcher.swiftsimilarity index 98%rename from app/Sources/NotProtonApp/Model/ValveFetcher.swiftrename to app/Sources/BridgeplayApp/Model/ValveFetcher.swiftindex e6844cd..1e475f2 100644--- a/app/Sources/NotProtonApp/Model/ValveFetcher.swift+++ b/app/Sources/BridgeplayApp/Model/ValveFetcher.swift@@ -86,7 +86,7 @@ enum ValveFetcher {at: destination.deletingLastPathComponent(), withIntermediateDirectories: true)- let pending = destination.appendingPathExtension("notproton-pending")+ let pending = destination.appendingPathExtension("bridgeplay-pending")try? files.removeItem(at: pending)try files.copyItem(at: extracted.appending(path: file.innerPath), to: pending)diff --git a/app/Sources/NotProtonApp/Model/ValvePackageManifest.swift b/app/Sources/BridgeplayApp/Model/ValvePackageManifest.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Model/ValvePackageManifest.swiftrename to app/Sources/BridgeplayApp/Model/ValvePackageManifest.swiftdiff --git a/app/Sources/NotProtonApp/PrefixesModel.swift b/app/Sources/BridgeplayApp/PrefixesModel.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/PrefixesModel.swiftrename to app/Sources/BridgeplayApp/PrefixesModel.swiftdiff --git a/app/Sources/NotProtonApp/Resources/Fonts/OFL-Geist.txt b/app/Sources/BridgeplayApp/Resources/Fonts/OFL-Geist.txtsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/Fonts/OFL-Geist.txtrename to app/Sources/BridgeplayApp/Resources/Fonts/OFL-Geist.txtdiff --git a/app/Sources/NotProtonApp/Resources/Fonts/OFL-Unbounded.txt b/app/Sources/BridgeplayApp/Resources/Fonts/OFL-Unbounded.txtsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/Fonts/OFL-Unbounded.txtrename to app/Sources/BridgeplayApp/Resources/Fonts/OFL-Unbounded.txtdiff --git a/app/Sources/NotProtonApp/Resources/Fonts/geist.woff2 b/app/Sources/BridgeplayApp/Resources/Fonts/geist.woff2similarity index 100%rename from app/Sources/NotProtonApp/Resources/Fonts/geist.woff2rename to app/Sources/BridgeplayApp/Resources/Fonts/geist.woff2diff --git a/app/Sources/NotProtonApp/Resources/Fonts/unbounded.woff2 b/app/Sources/BridgeplayApp/Resources/Fonts/unbounded.woff2similarity index 100%rename from app/Sources/NotProtonApp/Resources/Fonts/unbounded.woff2rename to app/Sources/BridgeplayApp/Resources/Fonts/unbounded.woff2diff --git a/app/Sources/NotProtonApp/Resources/Localization/Localizable.xcstrings b/app/Sources/BridgeplayApp/Resources/Localization/Localizable.xcstringssimilarity index 100%rename from app/Sources/NotProtonApp/Resources/Localization/Localizable.xcstringsrename to app/Sources/BridgeplayApp/Resources/Localization/Localizable.xcstringsdiff --git a/app/Sources/NotProtonApp/Resources/crypt32-winecx-11.17.dll b/app/Sources/BridgeplayApp/Resources/crypt32-winecx-11.17.dllsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/crypt32-winecx-11.17.dllrename to app/Sources/BridgeplayApp/Resources/crypt32-winecx-11.17.dlldiff --git a/app/Sources/NotProtonApp/Resources/detour2-41069.bin b/app/Sources/BridgeplayApp/Resources/detour2-41069.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-41069.binrename to app/Sources/BridgeplayApp/Resources/detour2-41069.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-41073.bin b/app/Sources/BridgeplayApp/Resources/detour2-41073.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-41073.binrename to app/Sources/BridgeplayApp/Resources/detour2-41073.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-cx26.bin b/app/Sources/BridgeplayApp/Resources/detour2-cx26.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-cx26.binrename to app/Sources/BridgeplayApp/Resources/detour2-cx26.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-fex-41069.bin b/app/Sources/BridgeplayApp/Resources/detour2-fex-41069.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-fex-41069.binrename to app/Sources/BridgeplayApp/Resources/detour2-fex-41069.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-fex-41073.bin b/app/Sources/BridgeplayApp/Resources/detour2-fex-41073.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-fex-41073.binrename to app/Sources/BridgeplayApp/Resources/detour2-fex-41073.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-fex.bin b/app/Sources/BridgeplayApp/Resources/detour2-fex.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-fex.binrename to app/Sources/BridgeplayApp/Resources/detour2-fex.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-winecx-11.15.bin b/app/Sources/BridgeplayApp/Resources/detour2-winecx-11.15.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-winecx-11.15.binrename to app/Sources/BridgeplayApp/Resources/detour2-winecx-11.15.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-winecx-11.17.bin b/app/Sources/BridgeplayApp/Resources/detour2-winecx-11.17.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-winecx-11.17.binrename to app/Sources/BridgeplayApp/Resources/detour2-winecx-11.17.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2-winehq-11.15.bin b/app/Sources/BridgeplayApp/Resources/detour2-winehq-11.15.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2-winehq-11.15.binrename to app/Sources/BridgeplayApp/Resources/detour2-winehq-11.15.bindiff --git a/app/Sources/NotProtonApp/Resources/detour2.bin b/app/Sources/BridgeplayApp/Resources/detour2.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour2.binrename to app/Sources/BridgeplayApp/Resources/detour2.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-41069.bin b/app/Sources/BridgeplayApp/Resources/detour32-41069.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-41069.binrename to app/Sources/BridgeplayApp/Resources/detour32-41069.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-41073.bin b/app/Sources/BridgeplayApp/Resources/detour32-41073.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-41073.binrename to app/Sources/BridgeplayApp/Resources/detour32-41073.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-cx26.bin b/app/Sources/BridgeplayApp/Resources/detour32-cx26.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-cx26.binrename to app/Sources/BridgeplayApp/Resources/detour32-cx26.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-fex-41069.bin b/app/Sources/BridgeplayApp/Resources/detour32-fex-41069.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-fex-41069.binrename to app/Sources/BridgeplayApp/Resources/detour32-fex-41069.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-fex-41073.bin b/app/Sources/BridgeplayApp/Resources/detour32-fex-41073.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-fex-41073.binrename to app/Sources/BridgeplayApp/Resources/detour32-fex-41073.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-fex.bin b/app/Sources/BridgeplayApp/Resources/detour32-fex.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-fex.binrename to app/Sources/BridgeplayApp/Resources/detour32-fex.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-winecx-11.15.bin b/app/Sources/BridgeplayApp/Resources/detour32-winecx-11.15.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-winecx-11.15.binrename to app/Sources/BridgeplayApp/Resources/detour32-winecx-11.15.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-winecx-11.17.bin b/app/Sources/BridgeplayApp/Resources/detour32-winecx-11.17.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-winecx-11.17.binrename to app/Sources/BridgeplayApp/Resources/detour32-winecx-11.17.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32-winehq-11.15.bin b/app/Sources/BridgeplayApp/Resources/detour32-winehq-11.15.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32-winehq-11.15.binrename to app/Sources/BridgeplayApp/Resources/detour32-winehq-11.15.bindiff --git a/app/Sources/NotProtonApp/Resources/detour32.bin b/app/Sources/BridgeplayApp/Resources/detour32.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour32.binrename to app/Sources/BridgeplayApp/Resources/detour32.bindiff --git a/app/Sources/NotProtonApp/Resources/detour64-fex-41069.bin b/app/Sources/BridgeplayApp/Resources/detour64-fex-41069.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour64-fex-41069.binrename to app/Sources/BridgeplayApp/Resources/detour64-fex-41069.bindiff --git a/app/Sources/NotProtonApp/Resources/detour64-fex-41073.bin b/app/Sources/BridgeplayApp/Resources/detour64-fex-41073.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour64-fex-41073.binrename to app/Sources/BridgeplayApp/Resources/detour64-fex-41073.bindiff --git a/app/Sources/NotProtonApp/Resources/detour64-fex.bin b/app/Sources/BridgeplayApp/Resources/detour64-fex.binsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/detour64-fex.binrename to app/Sources/BridgeplayApp/Resources/detour64-fex.bindiff --git a/app/Sources/NotProtonApp/Resources/libSDL2-2.0.0.dylib b/app/Sources/BridgeplayApp/Resources/libSDL2-2.0.0.dylibsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/libSDL2-2.0.0.dylibrename to app/Sources/BridgeplayApp/Resources/libSDL2-2.0.0.dylibdiff --git a/app/Sources/NotProtonApp/Resources/nvapi64-shim.dll b/app/Sources/BridgeplayApp/Resources/nvapi64-shim.dllsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/nvapi64-shim.dllrename to app/Sources/BridgeplayApp/Resources/nvapi64-shim.dlldiff --git a/app/Sources/NotProtonApp/Resources/payload.manifest b/app/Sources/BridgeplayApp/Resources/payload.manifestsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/payload.manifestrename to app/Sources/BridgeplayApp/Resources/payload.manifestdiff --git a/app/Sources/NotProtonApp/Resources/valve-packages.manifest b/app/Sources/BridgeplayApp/Resources/valve-packages.manifestsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/valve-packages.manifestrename to app/Sources/BridgeplayApp/Resources/valve-packages.manifestdiff --git a/app/Sources/NotProtonApp/Resources/win32u-winecx-11.17.so b/app/Sources/BridgeplayApp/Resources/win32u-winecx-11.17.sosimilarity index 100%rename from app/Sources/NotProtonApp/Resources/win32u-winecx-11.17.sorename to app/Sources/BridgeplayApp/Resources/win32u-winecx-11.17.sodiff --git a/app/Sources/NotProtonApp/Resources/winebus-winecx-11.15.so b/app/Sources/BridgeplayApp/Resources/winebus-winecx-11.15.sosimilarity index 100%rename from app/Sources/NotProtonApp/Resources/winebus-winecx-11.15.sorename to app/Sources/BridgeplayApp/Resources/winebus-winecx-11.15.sodiff --git a/app/Sources/NotProtonApp/Resources/winebus-winecx-11.17.so b/app/Sources/BridgeplayApp/Resources/winebus-winecx-11.17.sosimilarity index 100%rename from app/Sources/NotProtonApp/Resources/winebus-winecx-11.17.sorename to app/Sources/BridgeplayApp/Resources/winebus-winecx-11.17.sodiff --git a/app/Sources/NotProtonApp/Resources/winebus-winecx-11.17.sys b/app/Sources/BridgeplayApp/Resources/winebus-winecx-11.17.syssimilarity index 100%rename from app/Sources/NotProtonApp/Resources/winebus-winecx-11.17.sysrename to app/Sources/BridgeplayApp/Resources/winebus-winecx-11.17.sysdiff --git a/app/Sources/NotProtonApp/Resources/winecoreaudio-winecx-11.17.so b/app/Sources/BridgeplayApp/Resources/winecoreaudio-winecx-11.17.sosimilarity index 100%rename from app/Sources/NotProtonApp/Resources/winecoreaudio-winecx-11.17.sorename to app/Sources/BridgeplayApp/Resources/winecoreaudio-winecx-11.17.sodiff --git a/app/Sources/NotProtonApp/Resources/wined3d-winecx-11.17.dll b/app/Sources/BridgeplayApp/Resources/wined3d-winecx-11.17.dllsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/wined3d-winecx-11.17.dllrename to app/Sources/BridgeplayApp/Resources/wined3d-winecx-11.17.dlldiff --git a/app/Sources/NotProtonApp/Resources/winemac-winecx-11.15.so b/app/Sources/BridgeplayApp/Resources/winemac-winecx-11.15.sosimilarity index 100%rename from app/Sources/NotProtonApp/Resources/winemac-winecx-11.15.sorename to app/Sources/BridgeplayApp/Resources/winemac-winecx-11.15.sodiff --git a/app/Sources/NotProtonApp/Resources/winemac-winecx-11.17.so b/app/Sources/BridgeplayApp/Resources/winemac-winecx-11.17.sosimilarity index 100%rename from app/Sources/NotProtonApp/Resources/winemac-winecx-11.17.sorename to app/Sources/BridgeplayApp/Resources/winemac-winecx-11.17.sodiff --git a/app/Sources/NotProtonApp/Resources/winemac-winehq-11.15.so b/app/Sources/BridgeplayApp/Resources/winemac-winehq-11.15.sosimilarity index 100%rename from app/Sources/NotProtonApp/Resources/winemac-winehq-11.15.sorename to app/Sources/BridgeplayApp/Resources/winemac-winehq-11.15.sodiff --git a/app/Sources/NotProtonApp/Resources/wintrust-winecx-11.17.dll b/app/Sources/BridgeplayApp/Resources/wintrust-winecx-11.17.dllsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/wintrust-winecx-11.17.dllrename to app/Sources/BridgeplayApp/Resources/wintrust-winecx-11.17.dlldiff --git a/app/Sources/NotProtonApp/Resources/ws2_32-winecx-11.17.dll b/app/Sources/BridgeplayApp/Resources/ws2_32-winecx-11.17.dllsimilarity index 100%rename from app/Sources/NotProtonApp/Resources/ws2_32-winecx-11.17.dllrename to app/Sources/BridgeplayApp/Resources/ws2_32-winecx-11.17.dlldiff --git a/app/Sources/NotProtonApp/SetupAssistant.swift b/app/Sources/BridgeplayApp/SetupAssistant.swiftsimilarity index 99%rename from app/Sources/NotProtonApp/SetupAssistant.swiftrename to app/Sources/BridgeplayApp/SetupAssistant.swiftindex 6db1e56..49178ef 100644--- a/app/Sources/NotProtonApp/SetupAssistant.swift+++ b/app/Sources/BridgeplayApp/SetupAssistant.swift@@ -294,7 +294,7 @@ final class SetupAssistant {}nonisolated static func canWriteSteam(app: URL = SupportPaths.Steam.app) -> Bool {- let probe = app.appending(path: "Contents/.notproton-write-probe")+ let probe = app.appending(path: "Contents/.bridgeplay-write-probe")guard FileManager.default.createFile(atPath: probe.path(percentEncoded: false), contents: Data()) else { return false }try? FileManager.default.removeItem(at: probe)return truediff --git a/app/Sources/NotProtonApp/Support/AppLog.swift b/app/Sources/BridgeplayApp/Support/AppLog.swiftsimilarity index 98%rename from app/Sources/NotProtonApp/Support/AppLog.swiftrename to app/Sources/BridgeplayApp/Support/AppLog.swiftindex 4607c7b..1749dac 100644--- a/app/Sources/NotProtonApp/Support/AppLog.swift+++ b/app/Sources/BridgeplayApp/Support/AppLog.swift@@ -8,7 +8,7 @@ enum AppLog {private static let sizeLimit = 512 * 1024- private static let queue = DispatchQueue(label: "notproton.applog")+ private static let queue = DispatchQueue(label: "bridgeplay.applog")private nonisolated(unsafe) static var isOn = falsediff --git a/app/Sources/NotProtonApp/Support/AppUpdater.swift b/app/Sources/BridgeplayApp/Support/AppUpdater.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/AppUpdater.swiftrename to app/Sources/BridgeplayApp/Support/AppUpdater.swiftdiff --git a/app/Sources/NotProtonApp/Support/AtomicReplace.swift b/app/Sources/BridgeplayApp/Support/AtomicReplace.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/AtomicReplace.swiftrename to app/Sources/BridgeplayApp/Support/AtomicReplace.swiftdiff --git a/app/Sources/NotProtonApp/Support/Clean.swift b/app/Sources/BridgeplayApp/Support/Clean.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/Clean.swiftrename to app/Sources/BridgeplayApp/Support/Clean.swiftdiff --git a/app/Sources/NotProtonApp/Support/Digest.swift b/app/Sources/BridgeplayApp/Support/Digest.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/Digest.swiftrename to app/Sources/BridgeplayApp/Support/Digest.swiftdiff --git a/app/Sources/NotProtonApp/Support/FileLock.swift b/app/Sources/BridgeplayApp/Support/FileLock.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/FileLock.swiftrename to app/Sources/BridgeplayApp/Support/FileLock.swiftdiff --git a/app/Sources/NotProtonApp/Support/InstallIntoSteamCommand.swift b/app/Sources/BridgeplayApp/Support/InstallIntoSteamCommand.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/InstallIntoSteamCommand.swiftrename to app/Sources/BridgeplayApp/Support/InstallIntoSteamCommand.swiftdiff --git a/app/Sources/NotProtonApp/Support/Launch.swift b/app/Sources/BridgeplayApp/Support/Launch.swiftsimilarity index 95%rename from app/Sources/NotProtonApp/Support/Launch.swiftrename to app/Sources/BridgeplayApp/Support/Launch.swiftindex 31f7862..7313ef0 100644--- a/app/Sources/NotProtonApp/Support/Launch.swift+++ b/app/Sources/BridgeplayApp/Support/Launch.swift@@ -18,6 +18,6 @@ enum Launch {return}#endif- NotProtonApp.main()+ BridgeplayApp.main()}}diff --git a/app/Sources/NotProtonApp/Support/MachOBuild.swift b/app/Sources/BridgeplayApp/Support/MachOBuild.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/MachOBuild.swiftrename to app/Sources/BridgeplayApp/Support/MachOBuild.swiftdiff --git a/app/Sources/NotProtonApp/Support/PinnedDownload.swift b/app/Sources/BridgeplayApp/Support/PinnedDownload.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/PinnedDownload.swiftrename to app/Sources/BridgeplayApp/Support/PinnedDownload.swiftdiff --git a/app/Sources/NotProtonApp/Support/PostUpdateRefresh.swift b/app/Sources/BridgeplayApp/Support/PostUpdateRefresh.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/PostUpdateRefresh.swiftrename to app/Sources/BridgeplayApp/Support/PostUpdateRefresh.swiftdiff --git a/app/Sources/NotProtonApp/Support/ProductVersion.swift b/app/Sources/BridgeplayApp/Support/ProductVersion.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/ProductVersion.swiftrename to app/Sources/BridgeplayApp/Support/ProductVersion.swiftdiff --git a/app/Sources/NotProtonApp/Support/RemoveEverythingCommand.swift b/app/Sources/BridgeplayApp/Support/RemoveEverythingCommand.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/RemoveEverythingCommand.swiftrename to app/Sources/BridgeplayApp/Support/RemoveEverythingCommand.swiftdiff --git a/app/Sources/NotProtonApp/Support/SetupPreview.swift b/app/Sources/BridgeplayApp/Support/SetupPreview.swiftsimilarity index 95%rename from app/Sources/NotProtonApp/Support/SetupPreview.swiftrename to app/Sources/BridgeplayApp/Support/SetupPreview.swiftindex 3a83e96..6181e6e 100644--- a/app/Sources/NotProtonApp/Support/SetupPreview.swift+++ b/app/Sources/BridgeplayApp/Support/SetupPreview.swift@@ -2,7 +2,7 @@import AppKitimport SwiftUI-// Debug builds only: `.build/debug/NotProtonApp --setup-preview [--fresh]` opens the Setup+// Debug builds only: `.build/debug/BridgeplayApp --setup-preview [--fresh]` opens the Setup// Assistant by itself for design review, then the main window once it closes. The assistant// reads this Mac's state and only pretends to act (--fresh shows a Mac that still needs// setup; --main skips straight to the main window). The main window is the real one: itsdiff --git a/app/Sources/NotProtonApp/Support/SetupWinecxCommand.swift b/app/Sources/BridgeplayApp/Support/SetupWinecxCommand.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/SetupWinecxCommand.swiftrename to app/Sources/BridgeplayApp/Support/SetupWinecxCommand.swiftdiff --git a/app/Sources/NotProtonApp/Support/Shell.swift b/app/Sources/BridgeplayApp/Support/Shell.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/Shell.swiftrename to app/Sources/BridgeplayApp/Support/Shell.swiftdiff --git a/app/Sources/NotProtonApp/Support/StepFailure.swift b/app/Sources/BridgeplayApp/Support/StepFailure.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/StepFailure.swiftrename to app/Sources/BridgeplayApp/Support/StepFailure.swiftdiff --git a/app/Sources/NotProtonApp/Support/SupportPaths.swift b/app/Sources/BridgeplayApp/Support/SupportPaths.swiftsimilarity index 63%rename from app/Sources/NotProtonApp/Support/SupportPaths.swiftrename to app/Sources/BridgeplayApp/Support/SupportPaths.swiftindex df2da55..0dcaa9f 100644--- a/app/Sources/NotProtonApp/Support/SupportPaths.swift+++ b/app/Sources/BridgeplayApp/Support/SupportPaths.swift@@ -4,7 +4,10 @@ import Foundationenum SupportPaths {- static let supportDirName = "notproton"+ static let supportDirName = "bridgeplay"+ // Builds before 3.0 kept everything under "notproton". BrandMigration moves it.+ static let legacySupportDirName = "notproton"+ // Shared with upstream NotProton: Steam's Info.plist and the dylib's own checks name it.static let dylibName = "notproton.dylib"static var home: URL {@@ -15,11 +18,38 @@ enum SupportPaths {home.appending(path: "Library/Application Support")}- // ~/Library/Application Support/notproton+ // ~/Library/Application Support/bridgeplaystatic var support: URL {applicationSupport.appending(path: supportDirName)}+ // ~/Library/Application Support/notproton, where builds before 3.0 kept their data.+ static var legacyApplicationSupport: URL {+ applicationSupport.appending(path: legacySupportDirName)+ }++ // ~/Library/Caches/bridgeplay+ static var caches: URL {+ home.appending(path: "Library/Caches/\(supportDirName)")+ }++ static var legacyCaches: URL {+ home.appending(path: "Library/Caches/\(legacySupportDirName)")+ }++ // ~/.bridgeplay: np-native and libnp_gamepad.dylib, at a path launch options can spell.+ static var homeDir: URL { home.appending(path: ".\(supportDirName)") }+ static var legacyHomeDir: URL { home.appending(path: ".\(legacySupportDirName)") }++ // The Steam bundles Bridgeplay modified, kept outside support so a reinstall keeps it.+ static var steamBundlesRecord: URL {+ applicationSupport.appending(path: "\(supportDirName)-steam-bundles.json")+ }++ static var legacySteamBundlesRecord: URL {+ applicationSupport.appending(path: "\(legacySupportDirName)-steam-bundles.json")+ }+static var bridge: URL { support.appending(path: "bridge") }static var runners: URL { support.appending(path: "runners") }static var backups: URL { support.appending(path: "backups") }@@ -39,13 +69,9 @@ enum SupportPaths {static var iconmaker: URL { support.appending(path: "iconmaker") }static var appinfo: URL { support.appending(path: "appinfo") }- static var packageDownloads: URL {- home.appending(path: "Library/Caches/\(supportDirName)/valve-packages")- }+ static var packageDownloads: URL { caches.appending(path: "valve-packages") }- static var winetricksDownloads: URL {- home.appending(path: "Library/Caches/\(supportDirName)/winetricks")- }+ static var winetricksDownloads: URL { caches.appending(path: "winetricks") }static var deployedVersion: URL { support.appending(path: "dylib.version") }@@ -72,6 +98,8 @@ enum SupportPaths {library.compatdata.appending(path: prefixTemplateFolder).appending(path: "crossover-\(build)-\(flavor.unixDir)")}+ // Inside each library's compatdata, beside the prefixes. Keeps its old name so the+ // templates already built there stay usable.static let prefixTemplateFolder = "notproton-template"static let bridgeCacheFolder = "bridge"@@ -113,13 +141,32 @@ enum SupportPaths {static var compatTools: URL { userData.appending(path: "compatibilitytools.d") }- static func notprotonTools(in directory: URL = compatTools) -> [URL] {+ // Every compatibility tool Bridgeplay wrote, under either name.+ static func ourTools(in directory: URL = compatTools) -> [URL] {let entries = (try? FileManager.default.contentsOfDirectory(at: directory, includingPropertiesForKeys: nil)) ?? []- return entries.filter { $0.lastPathComponent.hasPrefix("notproton") }+ return entries.filter { ToolName.isOurs($0.lastPathComponent) }}static var libraryFoldersVDF: URL { userData.appending(path: "steamapps/libraryfolders.vdf") }}}++// Steam compatibility tool names. Bridgeplay writes bridgeplay-*; builds before 3.0 wrote+// notproton-*, and those folders stay Bridgeplay's until BrandMigration renames them.+enum ToolName {+ static let prefix = "bridgeplay"+ static let legacyPrefix = "notproton"++ // notproton-winecx-11.17 -> bridgeplay-winecx-11.17, notproton -> bridgeplay. 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)+ }++ static func isLegacy(_ name: String) -> Bool { name.hasPrefix(legacyPrefix) }++ static func isOurs(_ name: String) -> Bool { name.hasPrefix(prefix) || isLegacy(name) }+}diff --git a/app/Sources/NotProtonApp/Support/TextWidth.swift b/app/Sources/BridgeplayApp/Support/TextWidth.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/TextWidth.swiftrename to app/Sources/BridgeplayApp/Support/TextWidth.swiftdiff --git a/app/Sources/NotProtonApp/Support/WriteRefused.swift b/app/Sources/BridgeplayApp/Support/WriteRefused.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Support/WriteRefused.swiftrename to app/Sources/BridgeplayApp/Support/WriteRefused.swiftdiff --git a/app/Sources/NotProtonApp/SystemStatus.swift b/app/Sources/BridgeplayApp/SystemStatus.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/SystemStatus.swiftrename to app/Sources/BridgeplayApp/SystemStatus.swiftdiff --git a/app/Sources/NotProtonApp/Views/BackupsView.swift b/app/Sources/BridgeplayApp/Views/BackupsView.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Views/BackupsView.swiftrename to app/Sources/BridgeplayApp/Views/BackupsView.swiftdiff --git a/app/Sources/NotProtonApp/Views/BridgeplayTheme.swift b/app/Sources/BridgeplayApp/Views/BridgeplayTheme.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Views/BridgeplayTheme.swiftrename to app/Sources/BridgeplayApp/Views/BridgeplayTheme.swiftdiff --git a/app/Sources/NotProtonApp/Views/PrefixesView.swift b/app/Sources/BridgeplayApp/Views/PrefixesView.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Views/PrefixesView.swiftrename to app/Sources/BridgeplayApp/Views/PrefixesView.swiftdiff --git a/app/Sources/NotProtonApp/Views/RootView.swift b/app/Sources/BridgeplayApp/Views/RootView.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Views/RootView.swiftrename to app/Sources/BridgeplayApp/Views/RootView.swiftdiff --git a/app/Sources/NotProtonApp/Views/SetupArt.swift b/app/Sources/BridgeplayApp/Views/SetupArt.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Views/SetupArt.swiftrename to app/Sources/BridgeplayApp/Views/SetupArt.swiftdiff --git a/app/Sources/NotProtonApp/Views/SetupAssistantView.swift b/app/Sources/BridgeplayApp/Views/SetupAssistantView.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Views/SetupAssistantView.swiftrename to app/Sources/BridgeplayApp/Views/SetupAssistantView.swiftdiff --git a/app/Sources/NotProtonApp/Views/StatusHero.swift b/app/Sources/BridgeplayApp/Views/StatusHero.swiftsimilarity index 100%rename from app/Sources/NotProtonApp/Views/StatusHero.swiftrename to app/Sources/BridgeplayApp/Views/StatusHero.swiftdiff --git a/app/Sources/NotProtonApp/Views/StatusView.swift b/app/Sources/BridgeplayApp/Views/StatusView.swiftsimilarity index 99%rename from app/Sources/NotProtonApp/Views/StatusView.swiftrename to app/Sources/BridgeplayApp/Views/StatusView.swiftindex 6c03a43..58726f7 100644--- a/app/Sources/NotProtonApp/Views/StatusView.swift+++ b/app/Sources/BridgeplayApp/Views/StatusView.swift@@ -620,7 +620,7 @@ struct StatusView: View {StatusRow(title: "Game Porting Toolkit",value: "Not found. Copy the redist/lib folder of Apple's Game Porting Toolkit to "- + "~/Library/Application Support/notproton/gptk, then press Rescan.",+ + "~/Library/Application Support/\(SupportPaths.supportDirName)/gptk, then press Rescan.",tone: .neutral,action: StatusAction(label: "Rescan",diff --git a/app/Tests/NotProtonAppTests/AppInfoToolTests.swift b/app/Tests/BridgeplayAppTests/AppInfoToolTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/AppInfoToolTests.swiftrename to app/Tests/BridgeplayAppTests/AppInfoToolTests.swiftindex 1d8126b..8857ef9 100644--- a/app/Tests/NotProtonAppTests/AppInfoToolTests.swift+++ b/app/Tests/BridgeplayAppTests/AppInfoToolTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// The launcher builds a game's bundle name and icon from what this tool prints, so a parse// that reads the wrong key mislabels a bundle. Caches are synthetic: the installed one is v29.diff --git a/app/Tests/BridgeplayAppTests/BrandNameTests.swift b/app/Tests/BridgeplayAppTests/BrandNameTests.swiftnew file mode 100644index 0000000..1f6fc57--- /dev/null+++ b/app/Tests/BridgeplayAppTests/BrandNameTests.swift@@ -0,0 +1,94 @@+import Foundation+import Testing++@testable import BridgeplayApp++@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")+ 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("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("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"))+ }++ @Test("Every tool Bridgeplay serves is named bridgeplay")+ func servedToolsUseTheNewPrefix() {+ let names = SupportedRunners.all.flatMap(\.tools).map(\.name)+ + FreeEngineWinecx.current.runner.tools.map(\.name)+ + SupportedRunners.toolPreference+ + [SupportedRunners.legacyToolName]+ #expect(!names.isEmpty)+ for name in names {+ #expect(name.hasPrefix(ToolName.prefix), "\(name)")+ }+ }++ @Test("Support, caches and the home folder have new names and legacy twins")+ func pathsAndLegacyPaths() {+ func path(_ url: URL) -> String { url.path(percentEncoded: false) }+ #expect(path(SupportPaths.support).hasSuffix("/Library/Application Support/bridgeplay"))+ #expect(path(SupportPaths.legacyApplicationSupport).hasSuffix("/Library/Application Support/notproton"))+ #expect(path(SupportPaths.caches).hasSuffix("/Library/Caches/bridgeplay"))+ #expect(path(SupportPaths.legacyCaches).hasSuffix("/Library/Caches/notproton"))+ #expect(path(SupportPaths.homeDir).hasSuffix("/.bridgeplay"))+ #expect(path(SupportPaths.legacyHomeDir).hasSuffix("/.notproton"))+ #expect(path(SupportPaths.packageDownloads).hasPrefix(path(SupportPaths.caches)))+ #expect(path(SupportPaths.winetricksDownloads).hasPrefix(path(SupportPaths.caches)))+ #expect(SupportPaths.steamBundlesRecord.lastPathComponent == "bridgeplay-steam-bundles.json")+ #expect(SupportPaths.legacySteamBundlesRecord.lastPathComponent == "notproton-steam-bundles.json")+ #expect(SupportPaths.dylibName == "notproton.dylib")+ }++ @Test("The list of modified Steam bundles is read from its old name and moved on the next write")+ func steamBundlesRecordFallsBack() throws {+ let root = FileManager.default.temporaryDirectory.appending(path: "bridgeplay-bundles-\(UUID().uuidString)")+ defer { try? FileManager.default.removeItem(at: root) }+ try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)+ let legacy = root.appending(path: "notproton-steam-bundles.json")+ let current = root.appending(path: "bridgeplay-steam-bundles.json")+ try JSONEncoder().encode(["/Applications/Steam.app"]).write(to: legacy)+ let modifications = SteamModifications(+ file: current, legacyRecord: root.appending(path: "install-build.json"), legacyFile: legacy)++ #expect(try modifications.paths().map(\.path) == ["/Applications/Steam.app"])++ try modifications.mark(URL(filePath: "/Volumes/Games/Steam.app"))+ #expect(!FileManager.default.fileExists(atPath: legacy.path(percentEncoded: false)))+ #expect(try modifications.paths().map(\.path) == ["/Applications/Steam.app", "/Volumes/Games/Steam.app"])+ }++ @Test("An Info.plist backup under the old name counts, and is removed with the new one")+ func plistBackupUnderEitherName() throws {+ let root = FileManager.default.temporaryDirectory.appending(path: "bridgeplay-backup-\(UUID().uuidString)")+ defer { try? FileManager.default.removeItem(at: root) }+ let backups = root.appending(path: "backups")+ try FileManager.default.createDirectory(at: backups, withIntermediateDirectories: true)+ let plist = root.appending(path: "Info.plist")+ try Data("modified".utf8).write(to: plist)+ try Data("pristine".utf8).write(to: backups.appending(path: SteamBundle.legacyPlistBackupName))++ #expect(try SteamInstaller.backUpPlist(plist, into: backups) == false)+ #expect(!FileManager.default.fileExists(+ atPath: backups.appending(path: SteamBundle.plistBackupName).path(percentEncoded: false)))++ #expect(try SteamRepair.removeStaleBackup(from: backups))+ #expect(try FileManager.default.contentsOfDirectory(atPath: backups.path(percentEncoded: false)).isEmpty)+ }+}diff --git a/app/Tests/NotProtonAppTests/BridgePayloadTests.swift b/app/Tests/BridgeplayAppTests/BridgePayloadTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/BridgePayloadTests.swiftrename to app/Tests/BridgeplayAppTests/BridgePayloadTests.swiftindex 220a631..536deb2 100644--- a/app/Tests/NotProtonAppTests/BridgePayloadTests.swift+++ b/app/Tests/BridgeplayAppTests/BridgePayloadTests.swift@@ -2,7 +2,7 @@ import Darwinimport Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Bridge payload")struct BridgePayloadTests {@@ -184,7 +184,7 @@ struct BridgePayloadTests {)let attribute = Data("metadata".utf8)let setResult = attribute.withUnsafeBytes {- setxattr(source.path(percentEncoded: false), "com.notproton.test", $0.baseAddress, $0.count, 0, 0)+ setxattr(source.path(percentEncoded: false), "com.bridgeplay.test", $0.baseAddress, $0.count, 0, 0)}#expect(setResult == 0)@@ -197,7 +197,7 @@ struct BridgePayloadTests {#expect(attributes[.posixPermissions] as? Int == 0o751)var copiedAttribute = Data(count: attribute.count)let readCount = copiedAttribute.withUnsafeMutableBytes {- getxattr(destination.path(percentEncoded: false), "com.notproton.test", $0.baseAddress, $0.count, 0, 0)+ getxattr(destination.path(percentEncoded: false), "com.bridgeplay.test", $0.baseAddress, $0.count, 0, 0)}#expect(readCount == attribute.count)#expect(copiedAttribute == attribute)diff --git a/app/Tests/NotProtonAppTests/CrossOverLicenseTests.swift b/app/Tests/BridgeplayAppTests/CrossOverLicenseTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/CrossOverLicenseTests.swiftrename to app/Tests/BridgeplayAppTests/CrossOverLicenseTests.swiftindex ae5e7f0..a8e9a0d 100644--- a/app/Tests/NotProtonAppTests/CrossOverLicenseTests.swift+++ b/app/Tests/BridgeplayAppTests/CrossOverLicenseTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// The check gates whether a runner may be cloned, so a wrong unlicensed verdict strands a user// who holds a good license. Fixtures carry their own keypair, so it reads the same either way.@@ -194,11 +194,11 @@ struct CrossOverLicenseTests {let status = CrossOverLicense.check(crossOverRoot: fix.root,searchDirs: fix.searchDirs,- openssl: "/usr/bin/notproton-no-such-openssl"+ openssl: "/usr/bin/bridgeplay-no-such-openssl")#expect(!status.licensed)#expect(status.diagnostic.contains("could not run"))- #expect(status.diagnostic.contains("notproton-no-such-openssl"))+ #expect(status.diagnostic.contains("bridgeplay-no-such-openssl"))#expect(status.detail == CrossOverLicense.notActivated)}diff --git a/app/Tests/NotProtonAppTests/CrossOverRowTests.swift b/app/Tests/BridgeplayAppTests/CrossOverRowTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/CrossOverRowTests.swiftrename to app/Tests/BridgeplayAppTests/CrossOverRowTests.swiftindex b31eca5..d89da89 100644--- a/app/Tests/NotProtonAppTests/CrossOverRowTests.swift+++ b/app/Tests/BridgeplayAppTests/CrossOverRowTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("CrossOver rows on the Status pane")struct CrossOverRowTests {diff --git a/app/Tests/NotProtonAppTests/CrossOverSourceTests.swift b/app/Tests/BridgeplayAppTests/CrossOverSourceTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/CrossOverSourceTests.swiftrename to app/Tests/BridgeplayAppTests/CrossOverSourceTests.swiftindex e576005..d29d735 100644--- a/app/Tests/NotProtonAppTests/CrossOverSourceTests.swift+++ b/app/Tests/BridgeplayAppTests/CrossOverSourceTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Choosing between installed CrossOvers")struct CrossOverSourceTests {@@ -84,7 +84,7 @@ struct CrossOverSourceTests {@Test("A bundle whose loader is not a known build is refused, not called modified")func unknownLoaderIsUnsupported() throws {let fm = FileManager.default- let dir = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-cx-\(UUID().uuidString)")+ let dir = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-cx-\(UUID().uuidString)")let bundle = dir.appending(path: "CrossOver Preview.app")let loader = bundle.appending(path: "Contents/SharedSupport/CrossOver/lib/wine/x86_64-unix/wine")try fm.createDirectory(at: loader.deletingLastPathComponent(), withIntermediateDirectories: true)diff --git a/app/Tests/NotProtonAppTests/DeploymentContentTests.swift b/app/Tests/BridgeplayAppTests/DeploymentContentTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/DeploymentContentTests.swiftrename to app/Tests/BridgeplayAppTests/DeploymentContentTests.swiftindex ebf7873..326176d 100644--- a/app/Tests/NotProtonAppTests/DeploymentContentTests.swift+++ b/app/Tests/BridgeplayAppTests/DeploymentContentTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Installed content")struct DeploymentContentTests {diff --git a/app/Tests/NotProtonAppTests/DetectionTests.swift b/app/Tests/BridgeplayAppTests/DetectionTests.swiftsimilarity index 87%rename from app/Tests/NotProtonAppTests/DetectionTests.swiftrename to app/Tests/BridgeplayAppTests/DetectionTests.swiftindex 969b77a..b6de34d 100644--- a/app/Tests/NotProtonAppTests/DetectionTests.swift+++ b/app/Tests/BridgeplayAppTests/DetectionTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Runner allow list")struct SupportedRunnerTests {@@ -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) == ["notproton-fex", "notproton-fex-rosetta", "notproton-26.3"])+ #expect(tools.map(\.name) == ["bridgeplay-fex", "bridgeplay-fex-rosetta", "bridgeplay-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) == ["notproton-fex-rosetta-41069", "notproton-26.3"])- let kept = SupportedRunners.tools(for: builds, fexAvailable: false, keeping: ["notproton-fex-41069"])- #expect(kept.map(\.name) == ["notproton-fex-41069", "notproton-fex-rosetta-41069", "notproton-26.3"])+ #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"])}@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) == ["notproton-fex", "notproton-fex-rosetta", "notproton-preview"])+ #expect(tools.map(\.name) == ["bridgeplay-fex", "bridgeplay-fex-rosetta", "bridgeplay-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) == ["notproton"])+ #expect(tools.map(\.name) == ["bridgeplay"])#expect(tools.first?.tool.flavor == .rosetta)}@@ -158,17 +158,21 @@ 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) == ["notproton", "notproton-fex", "notproton-fex-rosetta"])+ #expect(held.map(\.name) == ["bridgeplay", "bridgeplay-fex", "bridgeplay-fex-rosetta"])#expect(held.first?.build == "27.0.0.40921")let none = SupportedRunners.tools(for: builds, legacy: .nobody)- #expect(none.map(\.name) == ["notproton-fex", "notproton-fex-rosetta", "notproton-preview"])+ #expect(none.map(\.name) == ["bridgeplay-fex", "bridgeplay-fex-rosetta", "bridgeplay-preview"])}@Test("Every tool name is one the dylib accepts")func namesParse() {for tool in SupportedRunners.all.flatMap(\.tools) {- #expect(tool.name.hasPrefix("notproton"))- #expect(tool.name.contains("proton"))+ #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.allSatisfy { $0.isLetter || $0.isNumber || "._-".contains($0) })#expect(!tool.display.contains { "\"\\".contains($0) || $0.isNewline })}@@ -178,7 +182,7 @@ struct CompatToolOrderTests {func contents() throws {let tools = SupportedRunners.tools(for: [try build("26.3.0.39832")])#expect(CompatToolList.contents(tools)- == "notproton-26.3\t26.3.0.39832\trosetta\tCrossOver 26.3\n")+ == "bridgeplay-26.3\t26.3.0.39832\trosetta\tCrossOver 26.3\n")}}@@ -219,14 +223,14 @@ struct SupportPathTests {@Test("Paths match what the dylib and the run script use")func pathsAreStable() {let support = SupportPaths.support.path(percentEncoded: false)- #expect(support.hasSuffix("/Library/Application Support/notproton"))+ #expect(support.hasSuffix("/Library/Application Support/bridgeplay"))#expect(SupportPaths.signatures.path(percentEncoded: false)- .hasSuffix("/notproton/signatures/macos.arm64"))+ .hasSuffix("/bridgeplay/signatures/macos.arm64"))#expect(SupportPaths.overlayShim.path(percentEncoded: false)- .hasSuffix("/notproton/overlay-shim.dylib"))+ .hasSuffix("/bridgeplay/overlay-shim.dylib"))#expect(SupportPaths.toolList.path(percentEncoded: false)- .hasSuffix("/notproton/tools"))+ .hasSuffix("/bridgeplay/tools"))#expect(SupportPaths.Steam.deployedDylib.path(percentEncoded: false)== "/Applications/Steam.app/Contents/MacOS/notproton.dylib")#expect(SupportPaths.Steam.infoPlist.path(percentEncoded: false)diff --git a/app/Tests/NotProtonAppTests/FileLockTests.swift b/app/Tests/BridgeplayAppTests/FileLockTests.swiftsimilarity index 97%rename from app/Tests/NotProtonAppTests/FileLockTests.swiftrename to app/Tests/BridgeplayAppTests/FileLockTests.swiftindex 1cc720f..2d1fed6 100644--- a/app/Tests/NotProtonAppTests/FileLockTests.swift+++ b/app/Tests/BridgeplayAppTests/FileLockTests.swift@@ -3,7 +3,7 @@ import Foundationimport Synchronizationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("File locks")struct FileLockTests {diff --git a/app/Tests/NotProtonAppTests/FreeEngineTests.swift b/app/Tests/BridgeplayAppTests/FreeEngineTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/FreeEngineTests.swiftrename to app/Tests/BridgeplayAppTests/FreeEngineTests.swiftindex e2712a2..7a221ed 100644--- a/app/Tests/NotProtonAppTests/FreeEngineTests.swift+++ b/app/Tests/BridgeplayAppTests/FreeEngineTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Free WineHQ engine")struct FreeEngineTests {diff --git a/app/Tests/NotProtonAppTests/FreeEngineWinecxTests.swift b/app/Tests/BridgeplayAppTests/FreeEngineWinecxTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/FreeEngineWinecxTests.swiftrename to app/Tests/BridgeplayAppTests/FreeEngineWinecxTests.swiftindex 154fd4f..4e62977 100644--- a/app/Tests/NotProtonAppTests/FreeEngineWinecxTests.swift+++ b/app/Tests/BridgeplayAppTests/FreeEngineWinecxTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Free WineCX engine")struct FreeEngineWinecxTests {@@ -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 notproton-winecx")+ @Test("11.17 is the current release with its own tool; 11.15 keeps bridgeplay-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) == ["notproton-winecx-11.17"])- #expect(FreeEngineWinecx.previous.runner.tools.map(\.name) == ["notproton-winecx"])+ #expect(FreeEngineWinecx.current.runner.tools.map(\.name) == ["bridgeplay-winecx-11.17"])+ #expect(FreeEngineWinecx.previous.runner.tools.map(\.name) == ["bridgeplay-winecx"])let current = FreeEngineWinecx.current.runnerlet previous = FreeEngineWinecx.previous.runner- // Installing 11.17 adds a tool and never moves notproton-winecx, which every+ // Installing 11.17 adds a tool and never moves bridgeplay-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) == ["notproton-winecx-11.17", "notproton-winecx"])+ #expect(both.map(\.name) == ["bridgeplay-winecx-11.17", "bridgeplay-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) == ["notproton-winecx-11.17"])+ #expect(SupportedRunners.tools(for: [current]).map(\.name) == ["bridgeplay-winecx-11.17"])}@Test("Both free engines stay separate builds with their own loaders and tools")@@ -362,7 +362,7 @@ struct FreeEngineWinecxTests {let roots = WinecxD3DMetal.searchRoots(home: URL(filePath: "/Users/u"))#expect(roots.map { $0.path(percentEncoded: false) } == [- "/Users/u/Library/Application Support/notproton/gptk/",+ "/Users/u/Library/Application Support/bridgeplay/gptk/","/Applications/Game Porting Toolkit.app/","/Users/u/Applications/Game Porting Toolkit.app/",])diff --git a/app/Tests/NotProtonAppTests/InstallPayloadTests.swift b/app/Tests/BridgeplayAppTests/InstallPayloadTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/InstallPayloadTests.swiftrename to app/Tests/BridgeplayAppTests/InstallPayloadTests.swiftindex 859f1e0..ddfe2f8 100644--- a/app/Tests/NotProtonAppTests/InstallPayloadTests.swift+++ b/app/Tests/BridgeplayAppTests/InstallPayloadTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Install payload")struct InstallPayloadTests {diff --git a/app/Tests/NotProtonAppTests/InstallScriptMarkersTests.swift b/app/Tests/BridgeplayAppTests/InstallScriptMarkersTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/InstallScriptMarkersTests.swiftrename to app/Tests/BridgeplayAppTests/InstallScriptMarkersTests.swiftindex 24f3a03..a5cdbd8 100644--- a/app/Tests/NotProtonAppTests/InstallScriptMarkersTests.swift+++ b/app/Tests/BridgeplayAppTests/InstallScriptMarkersTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Install script markers")struct InstallScriptMarkersTests {diff --git a/app/Tests/NotProtonAppTests/LaunchEnvTests.swift b/app/Tests/BridgeplayAppTests/LaunchEnvTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/LaunchEnvTests.swiftrename to app/Tests/BridgeplayAppTests/LaunchEnvTests.swiftindex 3ab4fd4..946bf8c 100644--- a/app/Tests/NotProtonAppTests/LaunchEnvTests.swift+++ b/app/Tests/BridgeplayAppTests/LaunchEnvTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Launch environment")struct LaunchEnvTests {diff --git a/app/Tests/NotProtonAppTests/LocalSigningTests.swift b/app/Tests/BridgeplayAppTests/LocalSigningTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/LocalSigningTests.swiftrename to app/Tests/BridgeplayAppTests/LocalSigningTests.swiftindex 52d990b..3946337 100644--- a/app/Tests/NotProtonAppTests/LocalSigningTests.swift+++ b/app/Tests/BridgeplayAppTests/LocalSigningTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Local signing identity")struct LocalSigningTests {diff --git a/app/Tests/NotProtonAppTests/LocalizationTests.swift b/app/Tests/BridgeplayAppTests/LocalizationTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/LocalizationTests.swiftrename to app/Tests/BridgeplayAppTests/LocalizationTests.swiftindex 8f079e0..68b8ca6 100644--- a/app/Tests/NotProtonAppTests/LocalizationTests.swift+++ b/app/Tests/BridgeplayAppTests/LocalizationTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Localization")struct LocalizationTests {diff --git a/app/Tests/NotProtonAppTests/MachOBuildTests.swift b/app/Tests/BridgeplayAppTests/MachOBuildTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/MachOBuildTests.swiftrename to app/Tests/BridgeplayAppTests/MachOBuildTests.swiftindex 7a2dbdc..3e123c2 100644--- a/app/Tests/NotProtonAppTests/MachOBuildTests.swift+++ b/app/Tests/BridgeplayAppTests/MachOBuildTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Mach-O build identity")struct MachOBuildTests {diff --git a/app/Tests/NotProtonAppTests/NtdllPatcherTests.swift b/app/Tests/BridgeplayAppTests/NtdllPatcherTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/NtdllPatcherTests.swiftrename to app/Tests/BridgeplayAppTests/NtdllPatcherTests.swiftindex b8b67fe..4991e84 100644--- a/app/Tests/NotProtonAppTests/NtdllPatcherTests.swift+++ b/app/Tests/BridgeplayAppTests/NtdllPatcherTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// A stand-in PE with one file-backed section and one with nothing behind it, so the section// walk and every refusal run without CrossOver. Deliberately not an identity mapping.@@ -368,7 +368,7 @@ struct NtdllPatcherTests {// a build's patches are checkable on a machine that could never run it.@Test("An input that is not the pinned build is refused before anything is written")func unpinnedInputRefused() throws {- let directory = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-patch-\(UUID().uuidString)")+ let directory = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-patch-\(UUID().uuidString)")try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)defer { try? FileManager.default.removeItem(at: directory) }@@ -391,7 +391,7 @@ struct NtdllPatcherTests {@Test("A missing input is refused by name")func missingInputRefused() throws {- let source = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-absent-\(UUID().uuidString)")+ let source = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-absent-\(UUID().uuidString)")var checked = 0for build in SupportedRunners.all {@@ -433,7 +433,7 @@ struct NtdllPatcherTests {private static func expectStagingReproducesBridge(build: RunnerBuild, root: URL) throws {let fm = FileManager.default- let scratch = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-stage-\(UUID().uuidString)")+ let scratch = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-stage-\(UUID().uuidString)")defer { try? fm.removeItem(at: scratch) }try NtdllPatcher.stage(build: build, runnerRoot: root, bridge: scratch)@@ -465,7 +465,7 @@ struct NtdllPatcherTests {guard let root = Self.cleanRunnerRoot(for: build) else { continue }let fm = FileManager.default- let scratch = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-stage-\(UUID().uuidString)")+ let scratch = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-stage-\(UUID().uuidString)")defer { try? fm.removeItem(at: scratch) }// One file per patch the build defines. A build pins the arches its loader can map,@@ -480,7 +480,7 @@ struct NtdllPatcherTests {@Test("The clean source prefers the one time backup over a live file")func cleanSourcePrefersBackup() throws {- let root = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-root-\(UUID().uuidString)")+ let root = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-root-\(UUID().uuidString)")let directory = root.appending(path: "lib/wine/x86_64-windows")try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)defer { try? FileManager.default.removeItem(at: root) }diff --git a/app/Tests/NotProtonAppTests/PayloadManifestTests.swift b/app/Tests/BridgeplayAppTests/PayloadManifestTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/PayloadManifestTests.swiftrename to app/Tests/BridgeplayAppTests/PayloadManifestTests.swiftindex 5289383..96b1b17 100644--- a/app/Tests/NotProtonAppTests/PayloadManifestTests.swift+++ b/app/Tests/BridgeplayAppTests/PayloadManifestTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Payload manifest")struct PayloadManifestTests {diff --git a/app/Tests/NotProtonAppTests/PayloadStateTests.swift b/app/Tests/BridgeplayAppTests/PayloadStateTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/PayloadStateTests.swiftrename to app/Tests/BridgeplayAppTests/PayloadStateTests.swiftindex 44d3c3b..21eda2e 100644--- a/app/Tests/NotProtonAppTests/PayloadStateTests.swift+++ b/app/Tests/BridgeplayAppTests/PayloadStateTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// The dylib picks the signature database itself, in newest_sigdb_in_dir. What the app reports// has to be the file the dylib will load, or the status describes a different install.diff --git a/app/Tests/NotProtonAppTests/PinnedDownloadTests.swift b/app/Tests/BridgeplayAppTests/PinnedDownloadTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/PinnedDownloadTests.swiftrename to app/Tests/BridgeplayAppTests/PinnedDownloadTests.swiftindex 82dcaf4..16c4f1d 100644--- a/app/Tests/NotProtonAppTests/PinnedDownloadTests.swift+++ b/app/Tests/BridgeplayAppTests/PinnedDownloadTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// The pin is the only thing between a substituted download and code that gets unpacked and// run, and it had no test of its own. Hosts are file URLs, so none of this needs the network.diff --git a/app/Tests/NotProtonAppTests/PrefixPromptTests.swift b/app/Tests/BridgeplayAppTests/PrefixPromptTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/PrefixPromptTests.swiftrename to app/Tests/BridgeplayAppTests/PrefixPromptTests.swiftindex dedc212..67321be 100644--- a/app/Tests/NotProtonAppTests/PrefixPromptTests.swift+++ b/app/Tests/BridgeplayAppTests/PrefixPromptTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Asking before a prefix goes")struct PrefixPromptTests {diff --git a/app/Tests/NotProtonAppTests/PrefixStoreTests.swift b/app/Tests/BridgeplayAppTests/PrefixStoreTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/PrefixStoreTests.swiftrename to app/Tests/BridgeplayAppTests/PrefixStoreTests.swiftindex 895bb66..d305b7b 100644--- a/app/Tests/NotProtonAppTests/PrefixStoreTests.swift+++ b/app/Tests/BridgeplayAppTests/PrefixStoreTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Prefix store")struct PrefixStoreTests {diff --git a/app/Tests/NotProtonAppTests/PrefixToolsTests.swift b/app/Tests/BridgeplayAppTests/PrefixToolsTests.swiftsimilarity index 96%rename from app/Tests/NotProtonAppTests/PrefixToolsTests.swiftrename to app/Tests/BridgeplayAppTests/PrefixToolsTests.swiftindex 7635d0c..da2b55d 100644--- a/app/Tests/NotProtonAppTests/PrefixToolsTests.swift+++ b/app/Tests/BridgeplayAppTests/PrefixToolsTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Prefix tools")struct PrefixToolsTests {@@ -10,7 +10,7 @@ struct PrefixToolsTests {// out of compat_run.sh rather than restated here.private static func compatSource() throws -> String {let repoRoot = URL(filePath: #filePath)- .deletingLastPathComponent() // NotProtonAppTests+ .deletingLastPathComponent() // BridgeplayAppTests.deletingLastPathComponent() // Tests.deletingLastPathComponent() // app.deletingLastPathComponent() // repo root@@ -30,16 +30,42 @@ struct PrefixToolsTests {@Test("Log paths match where compat_run.sh writes them")func logPathsMatchRunScript() throws {let source = try Self.compatSource()- #expect(source.contains(#"log="$STEAM_COMPAT_DATA_PATH/notproton-run.log""#))- #expect(source.contains(#"loader_root="$HOME/Library/Application Support/notproton/launchers/$app_id""#))- #expect(source.contains(#"wine_log="$loader_root/notproton-wine.log""#))+ // compat_run.sh is renamed separately from the app; either spelling is a match until+ // both land, and the app falls back to the old file names anyway.+ func either(_ text: (String) -> String) -> Bool {+ source.contains(text("bridgeplay")) || source.contains(text("notproton"))+ }+ #expect(either { #"log="$STEAM_COMPAT_DATA_PATH/\#($0)-run.log""# })+ #expect(either { #"loader_root="$HOME/Library/Application Support/\#($0)/launchers/$app_id""# })+ #expect(either { #"wine_log="$loader_root/\#($0)-wine.log""# })let prefix = samplePrefix()let launchers = URL(filePath: "/tmp/launchers")- #expect(PrefixLog.launch.url(for: prefix, launchers: launchers) == prefix.root.appending(path: "notproton-run.log"))+ #expect(PrefixLog.launch.url(for: prefix, launchers: launchers) == prefix.root.appending(path: "bridgeplay-run.log"))#expect(PrefixLog.wine.url(for: prefix, launchers: launchers).path(percentEncoded: false)- == "/tmp/launchers/1574480/notproton-wine.log")- #expect(SupportPaths.launchers.path(percentEncoded: false).hasSuffix("Application Support/notproton/launchers"))+ == "/tmp/launchers/1574480/bridgeplay-wine.log")+ #expect(SupportPaths.launchers.path(percentEncoded: false).hasSuffix("Application Support/bridgeplay/launchers"))+ }++ @Test("A log written before 3.0 is shown until the renamed one exists")+ func logFallsBackToTheOldName() throws {+ let root = FileManager.default.temporaryDirectory.appending(path: "bridgeplay-logs-\(UUID().uuidString)")+ defer { try? FileManager.default.removeItem(at: root) }+ let library = SteamLibrary(root: root)+ let prefix = WinePrefix(appID: "1574480", name: "Agent 64", library: library, lastUsed: nil)+ let launchers = root.appending(path: "launchers")+ try FileManager.default.createDirectory(at: prefix.root, withIntermediateDirectories: true)+ try FileManager.default.createDirectory(at: launchers.appending(path: "1574480"), withIntermediateDirectories: true)++ try Data("old".utf8).write(to: prefix.root.appending(path: "notproton-run.log"))+ try Data("old".utf8).write(to: launchers.appending(path: "1574480/notproton-wine.log"))+ #expect(PrefixLog.launch.url(for: prefix, launchers: launchers).lastPathComponent == "notproton-run.log")+ #expect(PrefixLog.wine.url(for: prefix, launchers: launchers).lastPathComponent == "notproton-wine.log")++ try Data("new".utf8).write(to: prefix.root.appending(path: "bridgeplay-run.log"))+ try Data("new".utf8).write(to: launchers.appending(path: "1574480/bridgeplay-wine.log"))+ #expect(PrefixLog.launch.url(for: prefix, launchers: launchers).lastPathComponent == "bridgeplay-run.log")+ #expect(PrefixLog.wine.url(for: prefix, launchers: launchers).lastPathComponent == "bridgeplay-wine.log")}@Test("The runner variables are the ones RUN_SCRIPT exports")@@ -68,7 +94,7 @@ struct PrefixToolsTests {("x86_64-unix", "wine", "wineserver-x86"),] {let runner = URL(filePath: NSTemporaryDirectory())- .appending(path: "notproton-layout-\(UUID().uuidString)")+ .appending(path: "bridgeplay-layout-\(UUID().uuidString)")defer { try? fm.removeItem(at: runner) }for path in ["lib/wine/\(arch)/\(loaderTail)", "bin/\(serverName)"] {@@ -1112,7 +1138,7 @@ struct PrefixToolsTests {let entry = library.compatdata.appending(path: "1574480")try FileManager.default.createDirectory(at: entry.appending(path: "pfx/drive_c"), withIntermediateDirectories: true)- try Data("log".utf8).write(to: entry.appending(path: "notproton-run.log"))+ try Data("log".utf8).write(to: entry.appending(path: "bridgeplay-run.log"))let prefix = try #require(PrefixStore.all(libraries: [library]).first)try PrefixTools.delete(prefix)@@ -1550,13 +1576,13 @@ struct PrefixLastBuildTests {to: prefix.root.appending(path: PrefixTools.buildRecordName), atomically: true, encoding: .utf8)let fexOnly = [InstalledTool(- tool: CompatTool(name: "notproton", flavor: .fex, display: "CrossOver Preview (FEX)"),+ tool: CompatTool(name: "bridgeplay", 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 == "notproton-fex-rosetta")+ #expect(PrefixTools.tool(for: prefix, among: both, runners: runners)?.name == "bridgeplay-fex-rosetta")}@Test("A prefix another CrossOver updated gets no tool, so nothing runs over it")diff --git a/app/Tests/NotProtonAppTests/PrefixesModelTests.swift b/app/Tests/BridgeplayAppTests/PrefixesModelTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/PrefixesModelTests.swiftrename to app/Tests/BridgeplayAppTests/PrefixesModelTests.swiftindex d5b5310..0eb2b25 100644--- a/app/Tests/NotProtonAppTests/PrefixesModelTests.swift+++ b/app/Tests/BridgeplayAppTests/PrefixesModelTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Loading measures every prefix with du and find in turn, so it stays in flight long enough// for a second to start on top. The libraries closure runs off the main actor, hence a lock.diff --git a/app/Tests/NotProtonAppTests/RealRebuildTests.swift b/app/Tests/BridgeplayAppTests/RealRebuildTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/RealRebuildTests.swiftrename to app/Tests/BridgeplayAppTests/RealRebuildTests.swiftindex 59800ae..7826b76 100644--- a/app/Tests/NotProtonAppTests/RealRebuildTests.swift+++ b/app/Tests/BridgeplayAppTests/RealRebuildTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// The real rebuild against a clone of a real prefix, where every other test fakes wineboot.// Caught My Documents going missing. Skipped without a runner and a prefix to clone.diff --git a/app/Tests/NotProtonAppTests/RunnerInstallerTests.swift b/app/Tests/BridgeplayAppTests/RunnerInstallerTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/RunnerInstallerTests.swiftrename to app/Tests/BridgeplayAppTests/RunnerInstallerTests.swiftindex 1be27c0..3b2d119 100644--- a/app/Tests/NotProtonAppTests/RunnerInstallerTests.swift+++ b/app/Tests/BridgeplayAppTests/RunnerInstallerTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Cloning a runner")struct RunnerInstallerTests {diff --git a/app/Tests/NotProtonAppTests/RunnerPatcherTests.swift b/app/Tests/BridgeplayAppTests/RunnerPatcherTests.swiftsimilarity index 97%rename from app/Tests/NotProtonAppTests/RunnerPatcherTests.swiftrename to app/Tests/BridgeplayAppTests/RunnerPatcherTests.swiftindex 72d6712..e415d3b 100644--- a/app/Tests/NotProtonAppTests/RunnerPatcherTests.swift+++ b/app/Tests/BridgeplayAppTests/RunnerPatcherTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Runner patching")struct RunnerPatcherTests {@@ -15,7 +15,7 @@ struct RunnerPatcherTests {let live = SupportPaths.clonedRoot(forBuild: build.id)let scratch = URL(filePath: NSTemporaryDirectory())- .appending(path: "notproton-runner-\(UUID().uuidString)")+ .appending(path: "bridgeplay-runner-\(UUID().uuidString)")let copied = try Shell.run("/bin/cp", ["-c", "-R", live.path(percentEncoded: false), scratch.path(percentEncoded: false),])@@ -145,7 +145,7 @@ struct RunnerPatcherTests {@Test("Loader discovery finds both the bare and the bundled layout")func loaderDiscoveryCoversBothLayouts() throws {let fm = FileManager.default- let root = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-loaders-\(UUID().uuidString)")+ let root = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-loaders-\(UUID().uuidString)")defer { try? fm.removeItem(at: root) }let bundled = root.appending(path: "lib/wine/aarch64-unix/wine.app/Contents/MacOS/wine")@@ -171,7 +171,7 @@ struct RunnerPatcherTests {@Test("The unix builtin follows the loader RUN_SCRIPT picks")func unixBuiltinFollowsTheLoader() throws {let fm = FileManager.default- let root = URL(filePath: NSTemporaryDirectory()).appending(path: "notproton-unixarch-\(UUID().uuidString)")+ let root = URL(filePath: NSTemporaryDirectory()).appending(path: "bridgeplay-unixarch-\(UUID().uuidString)")defer { try? fm.removeItem(at: root) }func write(_ path: String) throws {diff --git a/app/Tests/NotProtonAppTests/RunnerSetupTests.swift b/app/Tests/BridgeplayAppTests/RunnerSetupTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/RunnerSetupTests.swiftrename to app/Tests/BridgeplayAppTests/RunnerSetupTests.swiftindex c319681..5358d37 100644--- a/app/Tests/NotProtonAppTests/RunnerSetupTests.swift+++ b/app/Tests/BridgeplayAppTests/RunnerSetupTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Scratch directories rather than the live runner, so these say the same thing on a// machine that has never had a clone made on it.diff --git a/app/Tests/NotProtonAppTests/RunnerStateTests.swift b/app/Tests/BridgeplayAppTests/RunnerStateTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/RunnerStateTests.swiftrename to app/Tests/BridgeplayAppTests/RunnerStateTests.swiftindex dcdf89a..cd4914d 100644--- a/app/Tests/NotProtonAppTests/RunnerStateTests.swift+++ b/app/Tests/BridgeplayAppTests/RunnerStateTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Runner state detection")struct RunnerStateTests {diff --git a/app/Tests/NotProtonAppTests/RunnerSwitchTests.swift b/app/Tests/BridgeplayAppTests/RunnerSwitchTests.swiftsimilarity index 92%rename from app/Tests/NotProtonAppTests/RunnerSwitchTests.swiftrename to app/Tests/BridgeplayAppTests/RunnerSwitchTests.swiftindex 5ef50cc..b06af2f 100644--- a/app/Tests/NotProtonAppTests/RunnerSwitchTests.swift+++ b/app/Tests/BridgeplayAppTests/RunnerSwitchTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Preparing an installed build")struct RunnerPrepareTests {@@ -108,7 +108,7 @@ struct RunnerPrepareTests {#expect(toolList(runners) == CompatToolList.contents(SupportedRunners.tools(for: [Self.release, Self.fex])))- #expect(toolList(runners)?.hasPrefix("notproton-fex\t27.0.0.40921-fex\tfex\t") == true)+ #expect(toolList(runners)?.hasPrefix("bridgeplay-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.defaultlet compat = runners.appending(path: "compatibilitytools.d")- for name in ["notproton-gone", "GE-Proton"] {+ for name in ["bridgeplay-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,10 +225,44 @@ 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: "notproton-gone").path(percentEncoded: false)))+ #expect(!fm.fileExists(atPath: compat.appending(path: "bridgeplay-gone").path(percentEncoded: false)))#expect(fm.fileExists(atPath: compat.appending(path: "GE-Proton").path(percentEncoded: false)))}+ @Test("A tool under its name before 3.0 is left for the migration, never pruned")+ func legacyNamedToolIsKept() throws {+ let runners = try makeRunners(cloning: [Self.rosetta])+ defer { try? FileManager.default.removeItem(at: runners) }+ let fm = FileManager.default+ let compat = runners.appending(path: "compatibilitytools.d")+ let names = ["notproton", "notproton-gone", "notproton-winecx-11.17"]+ for name in names {+ try fm.createDirectory(at: compat.appending(path: name), withIntermediateDirectories: true)+ try Data("#!/bin/sh\n".utf8).write(to: compat.appending(path: "\(name)/run"))+ }++ try sync(runners)++ for name in names {+ #expect(fm.fileExists(atPath: compat.appending(path: "\(name)/run").path(percentEncoded: false)))+ }+ let listed = try #require(toolList(runners)).split(separator: "\n").compactMap { $0.split(separator: "\t").first }+ #expect(!listed.isEmpty)+ #expect(listed.allSatisfy { $0.hasPrefix("bridgeplay") })+ }++ @Test("A tool list written before 3.0 still names the legacy holder")+ func legacyListedHolderIsRecognised() throws {+ let runners = try makeRunners(cloning: [Self.fex])+ defer { try? FileManager.default.removeItem(at: runners) }+ let list = runners.appending(path: "tools")+ try atomicReplace(list, with: Data("notproton\t\(Self.fex.id)\tfex\tOld\n".utf8), step: "test")+ let builds = RunnerStore.installedBuilds(in: runners)+ #expect(CompatToolList.legacyHolder(+ builds: builds, listed: try String(contentsOf: list, encoding: .utf8), runners: runners+ ) == .build(Self.fex.id))+ }+private func sync(_ runners: URL) throws {try CompatToolList.sync(runners: runners, bridge: runners.appending(path: "bridge"), file: runners.appending(path: "tools"),@@ -238,7 +272,7 @@ struct RunnerPrepareTests {private func holder(_ runners: URL) -> String? {toolList(runners)?.split(separator: "\n").map { $0.split(separator: "\t") }- .first { $0.first == "notproton" }.map { String($0[1]) }+ .first { $0.first == "bridgeplay" }.map { String($0[1]) }}@Test("A 1.0 install keeps the legacy name on the build runners/current pointed at")@@ -256,7 +290,7 @@ struct RunnerPrepareTests {try sync(runners)#expect(holder(runners) == Self.rosetta.id)- #expect(toolList(runners)?.contains("notproton-fex\t\(Self.fex.id)\tfex\t") == true)+ #expect(toolList(runners)?.contains("bridgeplay-fex\t\(Self.fex.id)\tfex\t") == true)}@Test("Without FEX support a 1.0 FEX install keeps its legacy name")@@ -297,8 +331,8 @@ struct RunnerPrepareTests {)try sync(runners)#expect(holder(runners) == Self.fex.id)- #expect(toolList(runners)?.contains("notproton-preview\t\(Self.rosetta.id)\t") == true)- #expect(toolList(runners)?.contains("notproton-fex-rosetta\t\(Self.fex.id)\t") == true)+ #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)}@Test("A fresh install gives the legacy name to nobody")@@ -308,8 +342,8 @@ struct RunnerPrepareTests {try sync(runners)#expect(holder(runners) == nil)- #expect(toolList(runners)?.hasPrefix("notproton-fex-41069\t\(Self.fex41069.id)\tfex\t") == true)- #expect(toolList(runners)?.contains("notproton-preview-41069\t\(Self.preview41069.id)\t") == true)+ #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)}@Test("A 1.0.3 install keeps the legacy name on 41069")@@ -325,7 +359,7 @@ struct RunnerPrepareTests {#expect(holder(runners) == Self.preview41069.id)try sync(runners)#expect(holder(runners) == Self.preview41069.id)- #expect(toolList(runners)?.contains("notproton-fex-41069\t\(Self.fex41069.id)\tfex\t") == true)+ #expect(toolList(runners)?.contains("bridgeplay-fex-41069\t\(Self.fex41069.id)\tfex\t") == true)}@Test("A Preview listed under its own name does not take the legacy name later")@@ -350,6 +384,7 @@ struct RunnerPrepareTests {try FileManager.default.createSymbolicLink(atPath: current, withDestinationPath: "crossover-\(Self.fex.id)/CrossOver")+ // A tool written before 3.0, still under its old name.let run = runners.appending(path: "compatibilitytools.d/notproton/run")try atomicReplace(run, with: Data("CX_ROOT=\"$HOME/Library/Application Support/notproton/runners/current\"\n".utf8),diff --git a/app/Tests/NotProtonAppTests/SetupAssistantSnapshots.swift b/app/Tests/BridgeplayAppTests/SetupAssistantSnapshots.swiftsimilarity index 96%rename from app/Tests/NotProtonAppTests/SetupAssistantSnapshots.swiftrename to app/Tests/BridgeplayAppTests/SetupAssistantSnapshots.swiftindex e09c142..a243b36 100644--- a/app/Tests/NotProtonAppTests/SetupAssistantSnapshots.swift+++ b/app/Tests/BridgeplayAppTests/SetupAssistantSnapshots.swift@@ -2,7 +2,7 @@ import AppKitimport SwiftUIimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Renders the Setup Assistant's steps and the Status page to PNGs for review when// NOTPROTON_SNAPSHOTS names an output folder. Reads this Mac's state without changing it.@@ -84,7 +84,7 @@ struct SetupAssistantSnapshots {status.snapshot = StatusSnapshot.capture(bundledVersion: AppVersion.bundled)// The test build carries no payload; the installed app reports its files as current.status.snapshot?.installContent = .current- try render(RootView(pane: .constant(.status)), "1-notproton-status", size: CGSize(width: 900, height: 900), status: status,+ try render(RootView(pane: .constant(.status)), "1-bridgeplay-status", size: CGSize(width: 900, height: 900), status: status,chrome: [.titled, .fullSizeContentView])}}diff --git a/app/Tests/NotProtonAppTests/SetupAssistantTests.swift b/app/Tests/BridgeplayAppTests/SetupAssistantTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/SetupAssistantTests.swiftrename to app/Tests/BridgeplayAppTests/SetupAssistantTests.swiftindex 48d3ca2..1b45297 100644--- a/app/Tests/NotProtonAppTests/SetupAssistantTests.swift+++ b/app/Tests/BridgeplayAppTests/SetupAssistantTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Setup Assistant")struct SetupAssistantTests {diff --git a/app/Tests/NotProtonAppTests/ShellTests.swift b/app/Tests/BridgeplayAppTests/ShellTests.swiftsimilarity index 97%rename from app/Tests/NotProtonAppTests/ShellTests.swiftrename to app/Tests/BridgeplayAppTests/ShellTests.swiftindex db652c0..d7ceea2 100644--- a/app/Tests/NotProtonAppTests/ShellTests.swift+++ b/app/Tests/BridgeplayAppTests/ShellTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Shell")struct ShellTests {@@ -21,7 +21,7 @@ struct ShellTests {// Several megabytes against a 64K pipe buffer. A child filling the pipe while the parent// waits for it to exit cannot progress, so this hangs if the two reads stop overlapping.- let chunk = Data(String(repeating: "notproton ", count: 1024).utf8)+ let chunk = Data(String(repeating: "bridgeplay ", count: 1024).utf8)var payload = Data()for _ in 0..<512 { payload.append(chunk) }try payload.write(to: file)diff --git a/app/Tests/NotProtonAppTests/ShimAgreementTests.swift b/app/Tests/BridgeplayAppTests/ShimAgreementTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/ShimAgreementTests.swiftrename to app/Tests/BridgeplayAppTests/ShimAgreementTests.swiftindex 5a460ba..3cf8fa7 100644--- a/app/Tests/NotProtonAppTests/ShimAgreementTests.swift+++ b/app/Tests/BridgeplayAppTests/ShimAgreementTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// The app writes the runner and RUN_SCRIPT reads it back, in two languages nothing at build// time holds together, so a file the shim never checks goes stale. Both lists are parsed out.diff --git a/app/Tests/NotProtonAppTests/SteamBundleTests.swift b/app/Tests/BridgeplayAppTests/SteamBundleTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/SteamBundleTests.swiftrename to app/Tests/BridgeplayAppTests/SteamBundleTests.swiftindex 36273fc..eff803b 100644--- a/app/Tests/NotProtonAppTests/SteamBundleTests.swift+++ b/app/Tests/BridgeplayAppTests/SteamBundleTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Steam bundle")struct SteamBundleTests {diff --git a/app/Tests/NotProtonAppTests/SteamDefaultToolTests.swift b/app/Tests/BridgeplayAppTests/SteamDefaultToolTests.swiftsimilarity index 94%rename from app/Tests/NotProtonAppTests/SteamDefaultToolTests.swiftrename to app/Tests/BridgeplayAppTests/SteamDefaultToolTests.swiftindex d0af1d0..44af13a 100644--- a/app/Tests/NotProtonAppTests/SteamDefaultToolTests.swift+++ b/app/Tests/BridgeplayAppTests/SteamDefaultToolTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Steam default compatibility tool")struct SteamDefaultToolTests {@@ -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: "notproton-winecx-11.17"))- #expect(result == Self.head + "\n\t\t\t\t\"CompatToolMapping\"\n\t\t\t\t{\n" + Self.entry("notproton-winecx-11.17")+ 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")+ "\n\t\t\t\t}\n\t\t\t\t\"SentryFile\"\t\t\"x\"\n" + Self.tail)}diff --git a/app/Tests/NotProtonAppTests/SteamInstallerTests.swift b/app/Tests/BridgeplayAppTests/SteamInstallerTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/SteamInstallerTests.swiftrename to app/Tests/BridgeplayAppTests/SteamInstallerTests.swiftindex 1543fd5..ad57647 100644--- a/app/Tests/NotProtonAppTests/SteamInstallerTests.swift+++ b/app/Tests/BridgeplayAppTests/SteamInstallerTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Run against a real pinned Valve bundle staged into scratch, not /Applications/Steam.app.// The chain seals a dylib inside a bundle inside another signature. Serialized, one cache.@@ -238,7 +238,7 @@ struct SteamInstallerTests {try Shell.check("/usr/bin/xattr", ["-wx", "com.apple.FinderInfo", "0000000000000000040000000000000000000000000000000000000000000000", app,])- try Shell.check("/usr/bin/xattr", ["-w", "com.notproton.keep", "1", app])+ try Shell.check("/usr/bin/xattr", ["-w", "com.bridgeplay.keep", "1", app])#expect(!(try Shell.run("/usr/bin/codesign", ["-f", "-s", "-", app])).succeeded)_ = try install(fixture)@@ -248,7 +248,7 @@ struct SteamInstallerTests {let left = try Shell.run("/usr/bin/xattr", ["-lr", app]).stdout#expect(!left.contains("com.apple.FinderInfo"))#expect(!left.contains("com.apple.ResourceFork"))- #expect(left.contains("com.notproton.keep"))+ #expect(left.contains("com.bridgeplay.keep"))}@Test("An insert belonging to something else stops the install and is left alone")@@ -330,7 +330,7 @@ struct SteamInstallerTests {_ = try install(fixture)- let backup = fixture.backups.appending(path: "Info.plist.before-notproton")+ let backup = fixture.backups.appending(path: "Info.plist.before-bridgeplay")let saved = try #require(SteamBundle.readInfoPlist(at: backup))let environment = try #require(saved[SteamBundle.environmentKey] as? [String: Any])#expect(environment[SteamBundle.insertKey] == nil, "the backup already carries an insert")diff --git a/app/Tests/NotProtonAppTests/SteamPatchKeeperTests.swift b/app/Tests/BridgeplayAppTests/SteamPatchKeeperTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/SteamPatchKeeperTests.swiftrename to app/Tests/BridgeplayAppTests/SteamPatchKeeperTests.swiftindex 27764cc..af35e35 100644--- a/app/Tests/NotProtonAppTests/SteamPatchKeeperTests.swift+++ b/app/Tests/BridgeplayAppTests/SteamPatchKeeperTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Keeping Bridgeplay in Steam")struct SteamPatchKeeperTests {diff --git a/app/Tests/NotProtonAppTests/SteamRepairTests.swift b/app/Tests/BridgeplayAppTests/SteamRepairTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/SteamRepairTests.swiftrename to app/Tests/BridgeplayAppTests/SteamRepairTests.swiftindex ffdb745..a32f562 100644--- a/app/Tests/NotProtonAppTests/SteamRepairTests.swift+++ b/app/Tests/BridgeplayAppTests/SteamRepairTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Real package and real pin, like the Valve fetcher tests: whether the gate takes Valve's// actual bytes and refuses everything else is not a fixture question. Serialized, one cache.diff --git a/app/Tests/NotProtonAppTests/SystemStatusTests.swift b/app/Tests/BridgeplayAppTests/SystemStatusTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/SystemStatusTests.swiftrename to app/Tests/BridgeplayAppTests/SystemStatusTests.swiftindex 2c63eec..912c80e 100644--- a/app/Tests/NotProtonAppTests/SystemStatusTests.swift+++ b/app/Tests/BridgeplayAppTests/SystemStatusTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Progress reports reach the main actor as separate tasks, so one can arrive after the run// that issued it has finished. If it takes effect the app looks permanently busy.diff --git a/app/Tests/NotProtonAppTests/TemplateCleanupTests.swift b/app/Tests/BridgeplayAppTests/TemplateCleanupTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/TemplateCleanupTests.swiftrename to app/Tests/BridgeplayAppTests/TemplateCleanupTests.swiftindex d3d908f..33f3c8a 100644--- a/app/Tests/NotProtonAppTests/TemplateCleanupTests.swift+++ b/app/Tests/BridgeplayAppTests/TemplateCleanupTests.swift@@ -2,7 +2,7 @@ import Darwinimport Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Prefix template cleanup")struct TemplateCleanupTests {diff --git a/app/Tests/NotProtonAppTests/TestSupport.swift b/app/Tests/BridgeplayAppTests/TestSupport.swiftsimilarity index 96%rename from app/Tests/NotProtonAppTests/TestSupport.swiftrename to app/Tests/BridgeplayAppTests/TestSupport.swiftindex de6f427..d566cf9 100644--- a/app/Tests/NotProtonAppTests/TestSupport.swift+++ b/app/Tests/BridgeplayAppTests/TestSupport.swift@@ -1,6 +1,6 @@import Foundation-@testable import NotProtonApp+@testable import BridgeplayAppfunc scratchDirectory(_ label: String) throws -> URL {let url = URL.temporaryDirectory.appending(path: "np-\(label)-\(UUID().uuidString)")diff --git a/app/Tests/NotProtonAppTests/ToggleAgreementTests.swift b/app/Tests/BridgeplayAppTests/ToggleAgreementTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/ToggleAgreementTests.swiftrename to app/Tests/BridgeplayAppTests/ToggleAgreementTests.swiftindex 1775e69..c7e3bd4 100644--- a/app/Tests/NotProtonAppTests/ToggleAgreementTests.swift+++ b/app/Tests/BridgeplayAppTests/ToggleAgreementTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Toggle agreement")struct ToggleAgreementTests {diff --git a/app/Tests/NotProtonAppTests/UninstallTests.swift b/app/Tests/BridgeplayAppTests/UninstallTests.swiftsimilarity index 98%rename from app/Tests/NotProtonAppTests/UninstallTests.swiftrename to app/Tests/BridgeplayAppTests/UninstallTests.swiftindex 5825973..a32ea09 100644--- a/app/Tests/NotProtonAppTests/UninstallTests.swift+++ b/app/Tests/BridgeplayAppTests/UninstallTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Every path is passed explicitly. The defaults are /Applications/Steam.app, the real// steam.cfg and the real caches directory, so leaning on them would uninstall this machine.@@ -34,9 +34,9 @@ struct UninstallTests {let caches: URLvar compatTools: [URL] {- SupportPaths.Steam.notprotonTools(in: compatTool.deletingLastPathComponent())+ SupportPaths.Steam.ourTools(in: compatTool.deletingLastPathComponent())}- var secondTool: URL { compatTool.deletingLastPathComponent().appending(path: "notproton-26.3") }+ var secondTool: URL { compatTool.deletingLastPathComponent().appending(path: "bridgeplay-26.3") }var foreignTool: URL { compatTool.deletingLastPathComponent().appending(path: "GE-Proton9-1") }var outerPlist: URL { app.appending(path: "Contents/Info.plist") }@@ -54,13 +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.let compatTool = root.appending(path: "compatibilitytools.d/notproton")- let support = root.appending(path: "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: "notproton-26.3"), tools.appending(path: "GE-Proton9-1")] {+ tools.appending(path: "bridgeplay-26.3"), tools.appending(path: "GE-Proton9-1")] {try files.createDirectory(at: dir, withIntermediateDirectories: true)}@@ -294,7 +295,7 @@ struct UninstallTests {}@Test("An unplugged Steam that Bridgeplay was never installed into is not reported")- func ignoresAnUnpluggedSteamWithoutNotProton() async throws {+ func ignoresAnUnpluggedSteamWithoutBridgeplay() async throws {let layout = try layout()defer { try? FileManager.default.removeItem(at: layout.root) }diff --git a/app/Tests/NotProtonAppTests/UpdateBlockTests.swift b/app/Tests/BridgeplayAppTests/UpdateBlockTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/UpdateBlockTests.swiftrename to app/Tests/BridgeplayAppTests/UpdateBlockTests.swiftindex 586f323..a44e348 100644--- a/app/Tests/NotProtonAppTests/UpdateBlockTests.swift+++ b/app/Tests/BridgeplayAppTests/UpdateBlockTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Update block")struct UpdateBlockTests {diff --git a/app/Tests/NotProtonAppTests/ValveFetcherTests.swift b/app/Tests/BridgeplayAppTests/ValveFetcherTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/ValveFetcherTests.swiftrename to app/Tests/BridgeplayAppTests/ValveFetcherTests.swiftindex 3e9e634..e9eedeb 100644--- a/app/Tests/NotProtonAppTests/ValveFetcherTests.swift+++ b/app/Tests/BridgeplayAppTests/ValveFetcherTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp// Real packages and real pins into a throwaway bridge. A fixture would only prove the test// agrees with itself, so this pays for Valve's 97M once per machine and caches it.@@ -186,7 +186,7 @@ struct ValveFetcherTests {let landed = try files.contentsOfDirectory(atPath: bridge.path(percentEncoded: false))#expect(- !landed.contains { $0.contains("notproton-pending") },+ !landed.contains { $0.contains("bridgeplay-pending") },"a staging file was left in the bridge: \(landed)")}diff --git a/app/Tests/NotProtonAppTests/ValvePackageManifestTests.swift b/app/Tests/BridgeplayAppTests/ValvePackageManifestTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/ValvePackageManifestTests.swiftrename to app/Tests/BridgeplayAppTests/ValvePackageManifestTests.swiftindex 126825d..d78641f 100644--- a/app/Tests/NotProtonAppTests/ValvePackageManifestTests.swift+++ b/app/Tests/BridgeplayAppTests/ValvePackageManifestTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Valve package manifest")struct ValvePackageManifestTests {diff --git a/app/Tests/NotProtonAppTests/VersioningTests.swift b/app/Tests/BridgeplayAppTests/VersioningTests.swiftsimilarity index 99%rename from app/Tests/NotProtonAppTests/VersioningTests.swiftrename to app/Tests/BridgeplayAppTests/VersioningTests.swiftindex 8aba819..39dea5f 100644--- a/app/Tests/NotProtonAppTests/VersioningTests.swift+++ b/app/Tests/BridgeplayAppTests/VersioningTests.swift@@ -1,7 +1,7 @@import Foundationimport Testing-@testable import NotProtonApp+@testable import BridgeplayApp@Suite("Product version")struct ProductVersionTests {