anime-game-testing/the-honkers-railway-launcher
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

feat: Added 7z dependency requirement

Browse source
This commit is contained in:
Observer KRypt0n_ 2023-09-28 17:38:17 +02:00
parent 87a0bd6f96
commit 3e57468a3f
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main.rs
View file

@ -98,10 +98,10 @@ fn main() -> anyhow::Result<()> {
// Run the game // Run the game
let mut run_game = false; let mut run_game = false;
// Forcely run the game // Force run the game
let mut just_run_game = false; let mut just_run_game = false;
// Forcely disable verbode tracing output in stdout // Force disable verbose tracing output in stdout
let mut no_verbose_tracing = false; let mut no_verbose_tracing = false;
let args = std::env::args().collect::<Vec<_>>(); let args = std::env::args().collect::<Vec<_>>();

18
src/ui/first_run/dependencies.rs
View file

@ -69,7 +69,7 @@ impl SimpleAsyncComponent for DependenciesApp {
}, },
gtk::Entry { gtk::Entry {
set_text: "sudo pacman -Syu git xdelta3", set_text: "sudo pacman -Syu git xdelta3 p7zip",
set_editable: false set_editable: false
} }
}, },
@ -86,7 +86,7 @@ impl SimpleAsyncComponent for DependenciesApp {
}, },
gtk::Entry { gtk::Entry {
set_text: "sudo apt install git xdelta3", set_text: "sudo apt install git xdelta3 p7zip-full",
set_editable: false set_editable: false
} }
}, },
@ -103,7 +103,7 @@ impl SimpleAsyncComponent for DependenciesApp {
}, },
gtk::Entry { gtk::Entry {
set_text: "sudo dnf install git xdelta", set_text: "sudo dnf install git xdelta p7zip",
set_editable: false set_editable: false
} }
} }
@ -185,6 +185,18 @@ impl SimpleAsyncComponent for DependenciesApp {
} }
} }
// 7z sometimes has different binaries
if !is_available("7z") && !is_available("7za") {
sender.output(Self::Output::Toast {
title: tr!("package-not-available", {
"package" = "7z"
}),
description: None
});
return;
}
sender.output(Self::Output::ScrollToDefaultPaths); sender.output(Self::Output::ScrollToDefaultPaths);
} }

7
src/ui/first_run/welcome.rs
View file

@ -85,7 +85,12 @@ impl SimpleAsyncComponent for WelcomeApp {
match msg { match msg {
#[allow(unused_must_use)] #[allow(unused_must_use)]
WelcomeAppMsg::Continue => { WelcomeAppMsg::Continue => {
if is_available("git") && is_available("xdelta3") { let installed =
is_available("git") &&
is_available("xdelta3") &&
(is_available("7z") || is_available("7za"));
if installed {
sender.output(Self::Output::ScrollToDefaultPaths); sender.output(Self::Output::ScrollToDefaultPaths);
} else { } else {
sender.output(Self::Output::ScrollToDependencies); sender.output(Self::Output::ScrollToDependencies);