Merge pull request #11 from zakuciael/main
fix: wrong wine prefix for proton
This commit is contained in:
commit
064f03ebab
6 changed files with 24 additions and 24 deletions
|
@ -132,13 +132,13 @@ pub fn run() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare wine prefix drives
|
// Prepare wine prefix drives
|
||||||
|
let prefix_folder = config.get_wine_prefix_path();
|
||||||
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
|
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
|
||||||
|
|
||||||
// Workaround for sandboxing feature
|
// Workaround for sandboxing feature
|
||||||
if config.sandbox.enabled {
|
if config.sandbox.enabled {
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare bash -c '<command>'
|
// Prepare bash -c '<command>'
|
||||||
|
|
|
@ -80,13 +80,13 @@ pub fn run() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare wine prefix drives
|
// Prepare wine prefix drives
|
||||||
|
let prefix_folder = config.get_wine_prefix_path();
|
||||||
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
|
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
|
||||||
|
|
||||||
// Workaround for sandboxing feature
|
// Workaround for sandboxing feature
|
||||||
if config.sandbox.enabled {
|
if config.sandbox.enabled {
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare bash -c '<command>'
|
// Prepare bash -c '<command>'
|
||||||
|
|
|
@ -76,13 +76,13 @@ pub fn run() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare wine prefix drives
|
// Prepare wine prefix drives
|
||||||
|
let prefix_folder = config.get_wine_prefix_path();
|
||||||
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
|
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
|
||||||
|
|
||||||
// Workaround for sandboxing feature
|
// Workaround for sandboxing feature
|
||||||
if config.sandbox.enabled {
|
if config.sandbox.enabled {
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare bash -c '<command>'
|
// Prepare bash -c '<command>'
|
||||||
|
|
|
@ -80,15 +80,15 @@ pub fn run() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare wine prefix drives
|
// Prepare wine prefix drives
|
||||||
|
let prefix_folder = config.get_wine_prefix_path();
|
||||||
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
|
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
|
||||||
|
|
||||||
// Workaround for the jadeite patch (we run it from Z: drive)
|
// 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
|
// Workaround for sandboxing feature
|
||||||
if config.sandbox.enabled {
|
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>'
|
// Prepare bash -c '<command>'
|
||||||
|
|
|
@ -70,13 +70,13 @@ pub fn run() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare wine prefix drives
|
// Prepare wine prefix drives
|
||||||
|
let prefix_folder = config.get_wine_prefix_path();
|
||||||
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
|
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
|
||||||
|
|
||||||
// Workaround for sandboxing feature
|
// Workaround for sandboxing feature
|
||||||
if config.sandbox.enabled {
|
if config.sandbox.enabled {
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare bash -c '<command>'
|
// Prepare bash -c '<command>'
|
||||||
|
|
|
@ -91,13 +91,13 @@ pub fn run() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare wine prefix drives
|
// Prepare wine prefix drives
|
||||||
|
let prefix_folder = config.get_wine_prefix_path();
|
||||||
config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?;
|
config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?;
|
||||||
|
|
||||||
// Workaround for sandboxing feature
|
// Workaround for sandboxing feature
|
||||||
if config.sandbox.enabled {
|
if config.sandbox.enabled {
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?;
|
||||||
WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?;
|
WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare bash -c '<command>'
|
// Prepare bash -c '<command>'
|
||||||
|
|
Loading…
Reference in a new issue