android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ksud: remove modules dir when uninstall. close #1736

Browse Source
This commit is contained in:
weishu
2024-05-28 11:28:28 +08:00
parent 916d6bcd06
commit f381e32434
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
userspace/ksud/src/utils.rs
View File

@@ -190,7 +190,7 @@ pub fn has_magisk() -> bool {
} }
fn is_ok_empty(dir: &str) -> bool { fn is_ok_empty(dir: &str) -> bool {
use std::result::Result::{Err, Ok}; use std::result::Result::Ok;
match fs::read_dir(dir) { match fs::read_dir(dir) {
Ok(mut entries) => entries.next().is_none(), Ok(mut entries) => entries.next().is_none(),
@@ -199,7 +199,7 @@ fn is_ok_empty(dir: &str) -> bool {
} }
fn find_temp_path() -> String { fn find_temp_path() -> String {
use std::result::Result::{Err, Ok}; use std::result::Result::Ok;
if is_ok_empty(defs::TEMP_DIR) { if is_ok_empty(defs::TEMP_DIR) {
return defs::TEMP_DIR.to_string(); return defs::TEMP_DIR.to_string();
@@ -286,8 +286,11 @@ pub fn uninstall(magiskboot_path: Option<PathBuf>) -> Result<()> {
module::prune_modules()?; module::prune_modules()?;
} }
println!("- Removing directories.."); println!("- Removing directories..");
std::fs::remove_dir_all(defs::WORKING_DIR)?; std::fs::remove_dir_all(defs::WORKING_DIR).ok();
std::fs::remove_file(defs::DAEMON_PATH)?; std::fs::remove_file(defs::DAEMON_PATH).ok();
crate::mount::umount_dir(defs::MODULE_DIR).ok();
std::fs::remove_dir_all(defs::MODULE_DIR).ok();
std::fs::remove_dir_all(defs::MODULE_UPDATE_TMP_DIR).ok();
println!("- Restore boot image.."); println!("- Restore boot image..");
boot_patch::restore(None, magiskboot_path, true)?; boot_patch::restore(None, magiskboot_path, true)?;
println!("- Uninstall KernelSU manager.."); println!("- Uninstall KernelSU manager..");