v0.3.5

Author: DerGoogler

CHANGELOG.md

@@ -1 +1,4 @@
 # 0.3.5
+
+- Fixed Magisk install issue
+- Added MMAR V2 to the default repos

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "mmrl"
 description = "MMRL comes now as command line interface, with multi module install support!"
-version = "0.3.4"
+version = "0.3.5"
 edition = "2021"
 author = "Der_Googler"
 
@@ -25,7 +25,6 @@ regex = "1.10.2"
 async-recursion = "1.0.5"
 openssl = { version = "0.10.45", features = ["vendored"] }
 url = "2.2"
-git2 = "0.18.1"
 walkdir = "2.4.0"
 
 [dependencies.confy]

Cargo.toml

@@ -1,7 +1,7 @@
 id=mmrl
 name=MMRL CLI
-version=0.3.4
-versionCode=034
+version=0.3.5
+versionCode=035
 author=Der_Googler
-description=MMRL Command Line Interface is a free tool to install Magisk/KernelSU modules. Build on 2024-06-22 with Rust 1.78.0.
+description=MMRL Command Line Interface is a free tool to install Magisk/KernelSU modules. Build on 2024-06-24 with Rust 1.78.0.
 updateJson=https://raw.githubusercontent.com/DerGoogler/MMRL-CLI/master/module/update.json

module/module.prop

@@ -29,7 +29,7 @@ const info = include("info.json")
 
 export default () => {
     const [repos, setRepos] = useNativeFileStorage("/data/adb/mmrl/repos.json", [
-        "https://raw.githubusercontent.com/ya0211/magisk-modules-alt-repo/main/json/modules.json",
+        "https://magisk-modules-alt-repo.github.io/json-v2/json/modules.json",
         "https://gr.dergoogler.com/gmr/json/modules.json"
     ], { loader: "json" })
 

module/system/usr/share/mmrl/config/mmrl/index.jsx

@@ -1,7 +1,7 @@
 {
-    "version": "0.3.4",
-    "versionCode": "034",
+    "version": "0.3.5",
+    "versionCode": "035",
     "author": "Der_Googler",
     "rustVersion": "1.78.0",
-    "buildDate": "2024-06-22"
+    "buildDate": "2024-06-24"
 }

module/system/usr/share/mmrl/config/mmrl/info.json

@@ -1,6 +1,6 @@
 {
-    "version": "0.3.4",
-    "versionCode": "034",
-    "zipUrl": "https://github.com/DerGoogler/MMRL-CLI/releases/download/v0.3.4/mmrl-0.3.4-module-aarch64.zip",
+    "version": "0.3.5",
+    "versionCode": "035",
+    "zipUrl": "https://github.com/DerGoogler/MMRL-CLI/releases/download/v0.3.5/mmrl-0.3.5-module-aarch64.zip",
     "changelog": "https://raw.githubusercontent.com/DerGoogler/MMRL-CLI/master/CHANGELOG.md"
 }

module/update.json

@@ -18,6 +18,13 @@ pub fn get_downloads_dir() -> String {
     };
 }
 
+pub fn is_mmrl() -> bool {
+    return match env::var("MMRL_INTR") {
+        Ok(val) => true,
+        Err(e) => false,
+    };
+}
+
 #[cfg(target_os = "android")]
 pub fn get_downloads_dir() -> String {
     return match env::var("EXTERNAL_STORAGE") {
@@ -81,32 +88,41 @@ pub fn has_apatch_su() -> bool {
     return mount_detect(&Searcher::new(r"(APD|APatch)"));
 }
 
-pub fn get_root_manager() -> String {
+pub fn get_root_manager() -> &'static str {
     if has_magisk_su() {
-        return String::from("Magisk");
+        return "Magisk";
     } else if has_kernel_su() {
-        return String::from("KernelSU");
+        return "KernelSU";
     } else if has_apatch_su() {
-        return String::from("APatchSU");
+        return "APatchSU";
     } else {
-        return String::from("Unknown");
+        return "Unknown";
     }
 }
 
 pub fn get_install_cli(path: &str) -> (&str, Vec<&str>) {
-    let msu = "/system/bin/magisk";
+    let msu = "/data/adb/magisk/magisk64";
     let ksu = "/data/adb/ksu/bin/ksud";
     let asu = "/data/adb/ap/bin/apd";
 
-    if Path::new(msu).exists() {
-        return (msu, vec!["--install-module", path]);
-    } else if Path::new(ksu).exists() {
-        return (ksu, vec!["module", "install", path]);
-    } else if Path::new(asu).exists() {
-        return (asu, vec!["module", "install", path]);
-    } else {
-        println!("! Unable to determine install cli");
-        exit(0)
+    match get_root_manager() {
+        "Magisk" => {
+            return (msu, vec!["--install-module", path]);
+        }
+        "KernelSU" => {
+            return (ksu, vec!["module", "install", path]);
+        }
+        "APatchSU" => {
+            return (asu, vec!["module", "install", path]);
+        }
+        "Unknown" => {
+            println!("! Unable to determine install cli");
+            exit(0)
+        }
+        _ => {
+            println!("! Unable to determine install cli");
+            exit(0)
+        }
     }
 }
 

src/android_root.rs

@@ -9,8 +9,6 @@ use reqwest::Client;
 use std::io::{BufRead, BufReader, Error, ErrorKind};
 use std::process::{exit, Command, Stdio};
 
-const METHOD_STORED: Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Stored);
-
 #[async_recursion]
 pub async fn install(
     client: Client,

src/cmd/install.rs

@@ -1,7 +1,6 @@
 use serde_json::Value;
 use std::fs::OpenOptions;
 use std::io::{self, Read, Seek, Write};
-use std::path::Path;
 use std::process::exit;
 
 use crate::repo::{find_module, Module};