WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move manager APK to module path (#2787)

This commit is contained in:
Howard Wu 2023-10-07 22:37:58 +08:00 committed by GitHub
parent 7674396eff
commit 35dfd650fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/src/main/java/org/lsposed/lspd/service/ConfigFileManager.java
View File

@ -81,7 +81,7 @@ public class ConfigFileManager {
static final Path basePath = Paths.get("/data/adb/lspd"); static final Path basePath = Paths.get("/data/adb/lspd");
static final Path modulePath = basePath.resolve("modules"); static final Path modulePath = basePath.resolve("modules");
static final Path daemonApkPath = Paths.get(System.getProperty("java.class.path", null)); static final Path daemonApkPath = Paths.get(System.getProperty("java.class.path", null));
static final Path managerApkPath = basePath.resolve("manager.apk"); static final Path managerApkPath = daemonApkPath.getParent().resolve("manager.apk");
static final File magiskDbPath = new File("/data/adb/magisk.db"); static final File magiskDbPath = new File("/data/adb/magisk.db");
private static final Path lockPath = basePath.resolve("lock"); private static final Path lockPath = basePath.resolve("lock");
private static final Path configDirPath = basePath.resolve("config"); private static final Path configDirPath = basePath.resolve("config");

6
magisk-loader/build.gradle.kts
View File

@ -317,7 +317,7 @@ val reRunDaemon = task<Exec>("reRunDaemon") {
) )
isIgnoreExitValue = true isIgnoreExitValue = true
} }
val tmpApk = "/data/local/tmp/lsp.apk" val tmpApk = "/data/local/tmp/manager.apk"
val pushApk = task<Exec>("pushApk") { val pushApk = task<Exec>("pushApk") {
group = "LSPosed" group = "LSPosed"
dependsOn(":app:assembleDebug") dependsOn(":app:assembleDebug")
@ -332,11 +332,9 @@ val openApp = task<Exec>("openApp") {
"com.android.shell/.BugreportWarningActivity" "com.android.shell/.BugreportWarningActivity"
) )
} }
task<Exec>("reRunApp") { task("reRunApp") {
group = "LSPosed" group = "LSPosed"
dependsOn(pushApk) dependsOn(pushApk)
commandLine(adb, "shell", "su", "-c", "mv -f $tmpApk /data/adb/lspd/manager.apk")
isIgnoreExitValue = true
finalizedBy(reRunDaemon) finalizedBy(reRunDaemon)
} }

2
magisk-loader/magisk_module/customize.sh
View File

@ -87,7 +87,7 @@ extract "$ZIPFILE" 'framework/lspd.dex' "$MODPATH"
extract "$ZIPFILE" 'daemon.apk' "$MODPATH" extract "$ZIPFILE" 'daemon.apk' "$MODPATH"
extract "$ZIPFILE" 'daemon' "$MODPATH" extract "$ZIPFILE" 'daemon' "$MODPATH"
rm -f /data/adb/lspd/manager.apk rm -f /data/adb/lspd/manager.apk
extract "$ZIPFILE" 'manager.apk' '/data/adb/lspd' extract "$ZIPFILE" 'manager.apk' "$MODPATH"
if [ "$FLAVOR" == "zygisk" ]; then if [ "$FLAVOR" == "zygisk" ]; then
mkdir -p "$MODPATH/zygisk" mkdir -p "$MODPATH/zygisk"

1
magisk-loader/magisk_module/post-fs-data.sh
View File

@ -20,6 +20,7 @@
MODDIR=${0%/*} MODDIR=${0%/*}
rm -f "/data/local/tmp/daemon.apk" rm -f "/data/local/tmp/daemon.apk"
rm -f "/data/local/tmp/manager.apk"
cd "$MODDIR" cd "$MODDIR"
unshare -m sh -c "$MODDIR/daemon $@&" unshare -m sh -c "$MODDIR/daemon $@&"