From 09a67f56425e00dee898795800b6be979b9f40d3 Mon Sep 17 00:00:00 2001 From: Rifat Azad Date: Sun, 5 Jan 2025 09:10:33 +0600 Subject: [PATCH] ksud: print KernelSU Next --- userspace/ksud/src/boot_patch.rs | 12 ++++++------ userspace/ksud/src/cli.rs | 14 +++++++------- userspace/ksud/src/su.rs | 4 ++-- userspace/ksud/src/utils.rs | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/userspace/ksud/src/boot_patch.rs b/userspace/ksud/src/boot_patch.rs index 8ce6ee73..309d4a85 100644 --- a/userspace/ksud/src/boot_patch.rs +++ b/userspace/ksud/src/boot_patch.rs @@ -212,7 +212,7 @@ pub fn restore( flash: bool, ) -> Result<()> { let tmpdir = tempfile::Builder::new() - .prefix("KernelSU") + .prefix("KernelSU Next") .tempdir() .context("create temp dir failed")?; let workdir = tmpdir.path(); @@ -235,7 +235,7 @@ pub fn restore( ensure!(status.success(), "magiskboot unpack failed"); let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?; - ensure!(is_kernelsu_patched, "boot image is not patched by KernelSU"); + ensure!(is_kernelsu_patched, "boot image is not patched by KernelSU Next"); let mut new_boot = None; let mut from_backup = false; @@ -298,7 +298,7 @@ pub fn restore( let output_dir = std::env::current_dir()?; let now = chrono::Utc::now(); let output_image = output_dir.join(format!( - "kernelsu_restore_{}.img", + "kernelsu_next_restore_{}.img", now.format("%Y%m%d_%H%M%S") )); @@ -370,7 +370,7 @@ fn do_patch( } let tmpdir = tempfile::Builder::new() - .prefix("KernelSU") + .prefix("KernelSU Next") .tempdir() .context("create temp dir failed")?; let workdir = tmpdir.path(); @@ -460,7 +460,7 @@ fn do_patch( "Cannot work with Magisk patched image" ); - println!("- Adding KernelSU LKM"); + println!("- Adding KernelSU Next LKM"); let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?; let mut need_backup = false; @@ -501,7 +501,7 @@ fn do_patch( let output_dir = out.unwrap_or(std::env::current_dir()?); let now = chrono::Utc::now(); let output_image = output_dir.join(format!( - "kernelsu_patched_{}.img", + "kernelsu_next_patched_{}.img", now.format("%Y%m%d_%H%M%S") )); diff --git a/userspace/ksud/src/cli.rs b/userspace/ksud/src/cli.rs index 8cdb4a5b..9e4ddadc 100644 --- a/userspace/ksud/src/cli.rs +++ b/userspace/ksud/src/cli.rs @@ -10,7 +10,7 @@ use log::LevelFilter; use crate::defs::KSUD_VERBOSE_LOG_FILE; use crate::{apk_sign, assets, debug, defs, init_event, ksucalls, module, utils}; -/// KernelSU userspace cli +/// KernelSU Next userspace cli #[derive(Parser, Debug)] #[command(author, version = defs::VERSION_NAME, about, long_about = None)] struct Args { @@ -23,7 +23,7 @@ struct Args { #[derive(clap::Subcommand, Debug)] enum Commands { - /// Manage KernelSU modules + /// Manage KernelSU Next modules Module { #[command(subcommand)] command: Module, @@ -38,13 +38,13 @@ enum Commands { /// Trigger `boot-complete` event BootCompleted, - /// Install KernelSU userspace component to system + /// Install KernelSU Next userspace component to system Install { #[arg(long, default_value = None)] magiskboot: Option, }, - /// Uninstall KernelSU modules and itself(LKM Only) + /// Uninstall KernelSU Next modules and itself(LKM Only) Uninstall { /// magiskboot path, if not specified, will search from $PATH #[arg(long, default_value = None)] @@ -63,7 +63,7 @@ enum Commands { command: Profile, }, - /// Patch boot or init_boot images to apply KernelSU + /// Patch boot or init_boot images to apply KernelSU Next BootPatch { /// boot image path, if not specified, will try to find the boot image automatically #[arg(short, long)] @@ -102,7 +102,7 @@ enum Commands { kmi: Option, }, - /// Restore boot or init_boot images patched by KernelSU + /// Restore boot or init_boot images patched by KernelSU Next BootRestore { /// boot image path, if not specified, will try to find the boot image automatically #[arg(short, long)] @@ -277,7 +277,7 @@ pub fn run() -> Result<()> { android_logger::init_once( Config::default() .with_max_level(LevelFilter::Trace) // limit log level - .with_tag("KernelSU"), // logs will show under mytag tag + .with_tag("KernelSU Next"), // logs will show under mytag tag ); #[cfg(not(target_os = "android"))] diff --git a/userspace/ksud/src/su.rs b/userspace/ksud/src/su.rs index 7884137e..cda56c4f 100644 --- a/userspace/ksud/src/su.rs +++ b/userspace/ksud/src/su.rs @@ -43,7 +43,7 @@ pub fn grant_root(_global_mnt: bool) -> Result<()> { } fn print_usage(program: &str, opts: Options) { - let brief = format!("KernelSU\n\nUsage: {program} [options] [-] [user [argument...]]"); + let brief = format!("KernelSU Next\n\nUsage: {program} [options] [-] [user [argument...]]"); print!("{}", opts.usage(&brief)); } @@ -154,7 +154,7 @@ pub fn root_shell() -> Result<()> { } if matches.opt_present("v") { - println!("{}:KernelSU", defs::VERSION_NAME); + println!("{}:KernelSU Next", defs::VERSION_NAME); return Ok(()); } diff --git a/userspace/ksud/src/utils.rs b/userspace/ksud/src/utils.rs index 21033918..418b20c0 100644 --- a/userspace/ksud/src/utils.rs +++ b/userspace/ksud/src/utils.rs @@ -223,7 +223,7 @@ pub fn uninstall(magiskboot_path: Option) -> Result<()> { std::fs::remove_dir_all(defs::MODULE_DIR).ok(); println!("- Restore boot image.."); boot_patch::restore(None, magiskboot_path, true)?; - println!("- Uninstall KernelSU manager.."); + println!("- Uninstall KernelSU Next manager.."); Command::new("pm") .args(["uninstall", "com.rifsxd.ksunext"]) .spawn()?;