mirrors/envision
1
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-04-20 19:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: skip setcap if pkexec isn't found

Browse source
This commit is contained in:
Gabriele Musco 2023-06-23 19:51:17 +02:00
parent 8583eadd37
commit 453ad231c8
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dependencies/mod.rs
View file

@ -3,3 +3,4 @@ pub mod libsurvive_deps;
pub mod basalt_deps;
pub mod wivrn_deps;
pub mod adb_dep;
pub mod pkexec_dep;

9
src/dependencies/pkexec_dep.rs Normal file
View file

@ -0,0 +1,9 @@
use crate::depcheck::{DepType, Dependency};
pub fn pkexec_dep() -> Dependency {
Dependency {
name: "pkexec".into(),
dep_type: DepType::Executable,
filename: "pkexec".into(),
}
}

25
src/ui/app.rs
View file

@ -10,9 +10,11 @@ use crate::builders::build_opencomposite::get_build_opencomposite_runner;
use crate::builders::build_wivrn::get_build_wivrn_runner;
use crate::config::Config;
use crate::constants::APP_NAME;
use crate::depcheck::check_dependency;
use crate::dependencies::basalt_deps::get_missing_basalt_deps;
use crate::dependencies::libsurvive_deps::get_missing_libsurvive_deps;
use crate::dependencies::monado_deps::get_missing_monado_deps;
use crate::dependencies::pkexec_dep::pkexec_dep;
use crate::dependencies::wivrn_deps::get_missing_wivrn_deps;
use crate::file_utils::setcap_cap_sys_nice_eip;
use crate::profile::{Profile, XRServiceType};
@ -306,15 +308,20 @@ impl SimpleComponent for App {
self.build_pipeline = Some(pipeline);
}
Msg::RunSetCap => {
let profile = self.get_selected_profile();
setcap_cap_sys_nice_eip(match profile.xrservice_type {
XRServiceType::Monado => {
format!("{pfx}/bin/monado-service", pfx = profile.prefix)
}
XRServiceType::Wivrn => {
format!("{pfx}/bin/wivrn-serer", pfx = profile.prefix)
}
});
if !check_dependency(pkexec_dep()) {
println!("pkexec not found, skipping setcap");
}
else {
let profile = self.get_selected_profile();
setcap_cap_sys_nice_eip(match profile.xrservice_type {
XRServiceType::Monado => {
format!("{pfx}/bin/monado-service", pfx = profile.prefix)
}
XRServiceType::Wivrn => {
format!("{pfx}/bin/wivrn-serer", pfx = profile.prefix)
}
});
}
}
Msg::ProfileSelected(prof_name) => {
if prof_name == self.config.selected_profile_name {