ksud: Fix weird module.prop. close tiann#1191

1001ace1001 · Dec 15, 2023 · a115368 · a115368
1 parent 79341ab
commit a115368
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/userspace/ksud/src/installer.sh b/userspace/ksud/src/installer.sh
@@ -27,11 +27,11 @@ grep_cmdline() {
 }
 
 grep_prop() {
-  local REGEX="s/^$1=//p"
+  local REGEX="s/$1=//p"
   shift
   local FILES=$@
   [ -z "$FILES" ] && FILES='/system/build.prop'
-  cat $FILES 2>/dev/null | dos2unix | sed -n "$REGEX" | head -n 1
+  cat $FILES 2>/dev/null | dos2unix | sed -n "$REGEX" | head -n 1 | xargs
 }
 
 grep_get_prop() {

diff --git a/userspace/ksud/src/module.rs b/userspace/ksud/src/module.rs
@@ -354,6 +354,7 @@ fn _install_module(zip: &str) -> Result<()> {
     let Some(module_id) = module_prop.get("id") else {
         bail!("module id not found in module.prop!");
     };
+    let module_id = module_id.trim();
 
     let modules_img = Path::new(defs::MODULE_IMG);
     let modules_update_img = Path::new(defs::MODULE_UPDATE_IMG);