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

fix: fix self exe path error && opt: Optimize ensure_dir_exists processing (#541)

Browse Source 
* fix: fix self exe path error

* opt: Optimize ensure_dir_exists processing

---------

Signed-off-by: Tools-app <localhost.hutao@gmail.com>
This commit is contained in:
生于生时 亡于亡刻
2025-11-08 12:34:22 +08:00
committed by GitHub
parent d37a78ea2d
commit d8a8ef6458
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,13 +45,11 @@ pub fn ensure_file_exists<T: AsRef<Path>>(file: T) -> Result<()> {
} }
pub fn ensure_dir_exists<T: AsRef<Path>>(dir: T) -> Result<()> { pub fn ensure_dir_exists<T: AsRef<Path>>(dir: T) -> Result<()> {
let result = create_dir_all(&dir).map_err(Error::from); let result = create_dir_all(&dir);
if dir.as_ref().is_dir() { if dir.as_ref().is_dir() && result.is_err() {
result Ok(())
} else if result.is_ok() {
bail!("{} is not a regular directory", dir.as_ref().display())
} else { } else {
result bail!("{} is not a regular directory", dir.as_ref().display())
} }
} }
@@ -207,7 +205,10 @@ fn link_ksud_to_bin() -> Result<()> {
pub fn install(magiskboot: Option<PathBuf>) -> Result<()> { pub fn install(magiskboot: Option<PathBuf>) -> Result<()> {
ensure_dir_exists(defs::ADB_DIR)?; ensure_dir_exists(defs::ADB_DIR)?;
std::fs::copy("/proc/self/exe", defs::DAEMON_PATH)?; std::fs::copy(
std::env::current_exe().with_context(|| "Failed to get self exe path")?,
defs::DAEMON_PATH,
)?;
restorecon::lsetfilecon(defs::DAEMON_PATH, restorecon::ADB_CON)?; restorecon::lsetfilecon(defs::DAEMON_PATH, restorecon::ADB_CON)?;
// install binary assets // install binary assets
assets::ensure_binaries(false).with_context(|| "Failed to extract assets")?; assets::ensure_binaries(false).with_context(|| "Failed to extract assets")?;