mirror of
https://github.com/ALEZ-DEV/Babylonia-terminal.git
synced 2026-03-21 21:58:52 +00:00
all the install process work fine now
This commit is contained in:
parent
bbfb912f5b
commit
1795b9d580
@ -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");
|
||||
|
||||
|
||||
@ -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>(())
|
||||
})
|
||||
|
||||
@ -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")?;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user