diff --git a/babylonia-terminal-sdk/src/components/dxvk_component.rs b/babylonia-terminal-sdk/src/components/dxvk_component.rs index e9ec63b..c321b82 100644 --- a/babylonia-terminal-sdk/src/components/dxvk_component.rs +++ b/babylonia-terminal-sdk/src/components/dxvk_component.rs @@ -55,12 +55,7 @@ impl<'a> ComponentDownloader for DXVKComponent<'a> { Self::uncompress(file_output.clone(), self.path.clone()).await?; - let wine_prefix = self // wine take the data/wine/pfx prefix, but we want the data/wine prefix - .wine - .clone() - .with_prefix(self.wine.prefix.parent().unwrap()); - - wine_prefix + self.wine .install_dxvk(self.path.clone(), InstallParams::default()) .expect("Failed to installed DXVK"); diff --git a/babylonia-terminal-sdk/src/components/wine_component.rs b/babylonia-terminal-sdk/src/components/wine_component.rs index 929b2f5..fc9ee8e 100644 --- a/babylonia-terminal-sdk/src/components/wine_component.rs +++ b/babylonia-terminal-sdk/src/components/wine_component.rs @@ -87,7 +87,6 @@ impl ComponentDownloader for WineComponent { file.to_str().unwrap().strip_suffix(".tar.xz").unwrap(), new_directory_name, )?; - debug!("???5"); Ok::<(), anyhow::Error>(()) }) diff --git a/babylonia-terminal-sdk/src/game_manager.rs b/babylonia-terminal-sdk/src/game_manager.rs index 6504452..87bb086 100644 --- a/babylonia-terminal-sdk/src/game_manager.rs +++ b/babylonia-terminal-sdk/src/game_manager.rs @@ -87,10 +87,6 @@ impl GameManager { where P: Reporter + 'static, { - let wine_prefix = wine // wine take the data/wine/pfx prefix, but we want the data/wine prefix - .clone() - .with_prefix(wine.prefix.parent().unwrap()); - let max = 1; if let Some(p) = &progress { @@ -99,7 +95,7 @@ impl GameManager { notify_fonts_progress(0, max, &progress); - wine_prefix.install_font(Font::Arial)?; + wine.install_font(Font::Arial)?; notify_fonts_progress(1, max, &progress); let mut config = GameConfig::get_config().await; @@ -110,11 +106,7 @@ impl GameManager { } pub async fn install_dependencies(wine: &Wine) -> anyhow::Result<()> { - let wine_prefix = wine // wine take the data/wine/pfx prefix, but we want the data/wine prefix - .clone() - .with_prefix(wine.prefix.parent().unwrap()); - - let winetricks = Winetricks::from_wine("/bin/winetricks", wine_prefix); + let winetricks = Winetricks::from_wine("/bin/winetricks", wine); //winetricks.install("corefonts")?; let mut child = winetricks.install("vcrun2022")?;