Merge pull request #11 from zakuciael/main

fix: wrong wine prefix for proton
This commit is contained in:
Observer KRypt0n_ 2024-07-05 21:36:37 +02:00 committed by GitHub
commit 064f03ebab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 24 additions and 24 deletions

View file

@ -132,13 +132,13 @@ pub fn run() -> anyhow::Result<()> {
}
// Prepare wine prefix drives
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
let prefix_folder = config.get_wine_prefix_path();
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
// Workaround for sandboxing feature
if config.sandbox.enabled {
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
}
// Prepare bash -c '<command>'

View file

@ -80,13 +80,13 @@ pub fn run() -> anyhow::Result<()> {
}
// Prepare wine prefix drives
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
let prefix_folder = config.get_wine_prefix_path();
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
// Workaround for sandboxing feature
if config.sandbox.enabled {
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
}
// Prepare bash -c '<command>'

View file

@ -76,13 +76,13 @@ pub fn run() -> anyhow::Result<()> {
}
// Prepare wine prefix drives
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
let prefix_folder = config.get_wine_prefix_path();
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
// Workaround for sandboxing feature
if config.sandbox.enabled {
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
}
// Prepare bash -c '<command>'

View file

@ -80,15 +80,15 @@ pub fn run() -> anyhow::Result<()> {
}
// Prepare wine prefix drives
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
let prefix_folder = config.get_wine_prefix_path();
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
// Workaround for the jadeite patch (we run it from Z: drive)
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
// Workaround for sandboxing feature
if config.sandbox.enabled {
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
}
// Prepare bash -c '<command>'

View file

@ -70,13 +70,13 @@ pub fn run() -> anyhow::Result<()> {
}
// Prepare wine prefix drives
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
let prefix_folder = config.get_wine_prefix_path();
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
// Workaround for sandboxing feature
if config.sandbox.enabled {
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
}
// Prepare bash -c '<command>'

View file

@ -91,13 +91,13 @@ pub fn run() -> anyhow::Result<()> {
}
// Prepare wine prefix drives
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
let prefix_folder = config.get_wine_prefix_path();
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
// Workaround for sandboxing feature
if config.sandbox.enabled {
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
}
// Prepare bash -c '<command>'