diff options
Diffstat (limited to 'libs/nak/src/runtime_wrap.rs')
| -rw-r--r-- | libs/nak/src/runtime_wrap.rs | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/libs/nak/src/runtime_wrap.rs b/libs/nak/src/runtime_wrap.rs index 9b5ff89..69f693e 100644 --- a/libs/nak/src/runtime_wrap.rs +++ b/libs/nak/src/runtime_wrap.rs @@ -1,6 +1,5 @@ use std::env; use std::ffi::OsStr; -use std::path::{Path, PathBuf}; use std::process::Command; fn env_flag(name: &str) -> bool { @@ -18,35 +17,6 @@ pub fn use_steam_run() -> bool { env_flag("NAK_USE_STEAM_RUN") } -pub fn use_umu_for_prefix() -> bool { - env_flag("NAK_USE_UMU_FOR_PREFIX") -} - -pub fn prefer_system_umu() -> bool { - env_flag("NAK_PREFER_SYSTEM_UMU") -} - -fn find_in_path(binary: &str) -> Option<PathBuf> { - let path = env::var_os("PATH")?; - env::split_paths(&path) - .map(|entry| entry.join(binary)) - .find(|candidate| candidate.exists()) -} - -pub fn resolve_umu_run() -> Option<PathBuf> { - let bundled = env::var("NAK_BUNDLED_UMU_RUN") - .ok() - .map(PathBuf::from) - .filter(|p| p.exists()); - let system = find_in_path("umu-run"); - - if prefer_system_umu() { - system.or(bundled) - } else { - bundled.or(system) - } -} - /// Build a command to run `exe` with the given environment variables. /// /// In steam-run mode, the command is wrapped with `steam-run`. @@ -74,12 +44,3 @@ pub fn build_command<S: AsRef<OsStr>>( pub fn command_for(exe: impl AsRef<OsStr>) -> Command { build_command::<&str>(exe, &[]) } - -pub fn bundled_umu_path_from_appdir(appdir: &Path) -> Option<PathBuf> { - let path = appdir.join("umu-run"); - if path.exists() { - Some(path) - } else { - None - } -} |
