From c187d1ad8a6396bc8b12271fb857135ac313e28a Mon Sep 17 00:00:00 2001 From: skbeh <60107333+skbeh@users.noreply.github.com> Date: Sun, 12 Feb 2023 18:07:07 +0800 Subject: [PATCH] ksud: remove tailing "/" from `PATH` (#230) --- userspace/ksud/src/module.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/userspace/ksud/src/module.rs b/userspace/ksud/src/module.rs index 287047d3..050f61f8 100644 --- a/userspace/ksud/src/module.rs +++ b/userspace/ksud/src/module.rs @@ -44,7 +44,11 @@ fn exec_install_script(module_file: &str) -> Result<()> { .env("ASH_STANDALONE", "1") .env( "PATH", - format!("{}:{}", env_var("PATH").unwrap(), defs::BINARY_DIR), + format!( + "{}:{}", + env_var("PATH").unwrap(), + defs::BINARY_DIR.trim_end_matches('/') + ), ) .env("KSU", "true") .env("KSU_KERNEL_VER_CODE", crate::ksu::get_version().to_string()) @@ -87,7 +91,6 @@ fn mark_module_state(module: &str, flag_file: &str, create_or_delete: bool) -> R } fn get_minimal_image_size(img: &str) -> Result { - check_image(img)?; let output = Command::new("resize2fs") @@ -228,7 +231,11 @@ fn exec_script>(path: T, wait: bool) -> Result<()> { .env("KSU_VER", defs::VERSION_NAME) .env( "PATH", - format!("{}:{}", env_var("PATH").unwrap(), defs::BINARY_DIR), + format!( + "{}:{}", + env_var("PATH").unwrap(), + defs::BINARY_DIR.trim_end_matches('/') + ), ); let result = if wait {