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
refactor(app): drop unused Steam.executable, build migration paths from SupportPaths
raymondchins9752a90c7e85
diff --git a/app/Sources/BridgeplayApp/Model/BrandMigration.swift b/app/Sources/BridgeplayApp/Model/BrandMigration.swiftindex cb0d201..df3be94 100644--- a/app/Sources/BridgeplayApp/Model/BrandMigration.swift+++ b/app/Sources/BridgeplayApp/Model/BrandMigration.swift@@ -21,24 +21,21 @@ struct BrandMigration: Sendable {let home: URLlet steamUserData: URL- var steamRunning: @Sendable () -> Bool = { Shell.processIsRunning(named: "steam_osx") }+ var steamRunning: @Sendable () -> Bool = { SteamBundle.isRunningForThisUser }var gameRunning: @Sendable () -> Bool = { Shell.processIsRunning(named: "wineserver") }static let markerName = ".migrated-3.0.0"static let backupFolder = "backups/migration-3.0.0"static func live() -> BrandMigration {- let home = URL(filePath: NSHomeDirectory())- let applicationSupport = home.appending(path: "Library/Application Support")- let caches = home.appending(path: "Library/Caches")- return BrandMigration(- legacySupport: applicationSupport.appending(path: "notproton"),- support: applicationSupport.appending(path: "bridgeplay"),- legacyCaches: caches.appending(path: "notproton"),- caches: caches.appending(path: "bridgeplay"),- legacyHome: home.appending(path: ".notproton"),- home: home.appending(path: ".bridgeplay"),- steamUserData: applicationSupport.appending(path: "Steam"))+ BrandMigration(+ legacySupport: SupportPaths.legacyApplicationSupport,+ support: SupportPaths.support,+ legacyCaches: SupportPaths.legacyCaches,+ caches: SupportPaths.caches,+ legacyHome: SupportPaths.legacyHomeDir,+ home: SupportPaths.homeDir,+ steamUserData: SupportPaths.Steam.userData)}enum Blocker: Equatable, Sendable {diff --git a/app/Sources/BridgeplayApp/Support/SupportPaths.swift b/app/Sources/BridgeplayApp/Support/SupportPaths.swiftindex bf3c76c..acbfbc5 100644--- a/app/Sources/BridgeplayApp/Support/SupportPaths.swift+++ b/app/Sources/BridgeplayApp/Support/SupportPaths.swift@@ -117,7 +117,6 @@ enum SupportPaths {!FileManager.default.fileExists(atPath: bundle.deletingLastPathComponent().path(percentEncoded: false))}static var infoPlist: URL { infoPlist(inBundle: app) }- static var executable: URL { app.appending(path: "Contents/MacOS/steam_osx") }static var deployedDylib: URL { deployedDylib(inBundle: app) }static func infoPlist(inBundle bundle: URL) -> URL {