From cb706f01c2f938c7b8c7ae550540a0a8fdbb7d7c Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Sun, 22 Sep 2024 00:50:36 +0800
Subject: [PATCH] flash module: ignore META-INF

---
 .../java/com/topjohnwu/magisk/core/tasks/FlashZip.kt | 12 +++---------
 scripts/util_functions.sh                            |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
index ac69a172cd7fa..16d53ebe63be6 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
@@ -47,20 +47,14 @@ open class FlashZip(
             }
         }
 
-        val isValid = try {
-            zipFile.unzip(installDir, "META-INF/com/google/android", true)
-            val script = File(installDir, "updater-script")
-            script.readText().contains("#MAGISK")
+        try {
+            val binary = File(installDir, "update-binary")
+            AppContext.assets.open("module_installer.sh").use { it.writeTo(binary) }
         } catch (e: IOException) {
             console.add("! Unzip error")
             throw e
         }
 
-        if (!isValid) {
-            console.add("! This zip is not a Magisk module!")
-            return false
-        }
-
         console.add("- Installing ${mUri.displayName}")
 
         return Shell.cmd("sh $installDir/update-binary dummy 1 \'$zipFile\'")
diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh
index 59817134b630f..92449fa9507b0 100644
--- a/scripts/util_functions.sh
+++ b/scripts/util_functions.sh
@@ -641,7 +641,7 @@ install_module() {
 
   # Extract prop file
   unzip -o "$ZIPFILE" module.prop -d $TMPDIR >&2
-  [ ! -f $TMPDIR/module.prop ] && abort "! Unable to extract zip file!"
+  [ ! -f $TMPDIR/module.prop ] && abort "! This zip is not a Magisk module!"
 
   local MODDIRNAME=modules
   $BOOTMODE && MODDIRNAME=modules_update