瀏覽代碼

fix magisk module bug (#234)

部分设备magisk模块安装出现失败情况,对此进行修复
如图为在magisk27.1中无法安装

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/234
Co-authored-by: MasterOfStar <hzh4363703@live.com>
Co-committed-by: MasterOfStar <hzh4363703@live.com>
MasterOfStar 4 月之前
父節點
當前提交
b245a9c893
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      app/magisk/customize.sh
  2. 1 1
      buildSrc/src/main/kotlin/im/angry/openeuicc/build/Magisk.kt

+ 1 - 1
app/magisk/customize.sh

@@ -1,7 +1,7 @@
 TMP_FILE="$TMPDIR/{APK_NAME}"
 
 chmod u+x "$MODPATH/uninstall.sh"
-cp "$MODPATH/system/system_ext/{APK_NAME}/{APK_NAME}.apk" "$TMP_FILE"
+cp "$MODPATH/system/system_ext/priv-app/{APK_NAME}/{APK_NAME}.apk" "$TMP_FILE"
 
 pm install -r "$TMP_FILE"
 rm -f "$TMP_FILE"

+ 1 - 1
buildSrc/src/main/kotlin/im/angry/openeuicc/build/Magisk.kt

@@ -68,7 +68,7 @@ abstract class MagiskModuleDirTask : DefaultTask() {
         }
         dir.file("customize.sh").asFile.writeText(moduleCustomizeScriptText.get())
         dir.file("uninstall.sh").asFile.writeText(moduleUninstallScriptText.get())
-        metaInfDir.file("updater-script").asFile.writeText("# MAGISK")
+        metaInfDir.file("updater-script").asFile.writeText("#MAGISK\n")
         dir.file("module.prop").asFile.writeText(moduleProp.get().map { (k, v) -> "$k=$v" }.joinToString("\n"))
     }
 }