Skip to content

Commit b26dc90

Browse files
committed
Improvements for #65
only zips zygisk contains webroot and only when the zip is extracted in KernelSU enviroment webroot is extracted. The version of KernelSU is not checked because with updates we don't need re-install module.
1 parent f9a9195 commit b26dc90

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

magisk-loader/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,11 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
261261
rename("classes.dex", "lspd.dex")
262262
}
263263
into("webroot") {
264-
from("$projectDir/build/intermediates/generateWebRoot/dist") {
265-
include("**/*.js")
266-
include("**/*.html")
264+
if (flavorLowered == "zygisk") {
265+
from("$projectDir/build/intermediates/generateWebRoot/dist") {
266+
include("**/*.js")
267+
include("**/*.html")
268+
}
267269
}
268270
}
269271

magisk-loader/magisk_module/customize.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,17 @@ mkdir '/data/adb/lspd'
9292
extract "$ZIPFILE" 'cli' '/data/adb/lspd/bin'
9393

9494
if [ "$FLAVOR" == "zygisk" ]; then
95-
mkdir -p "$MODPATH/zygisk"
96-
97-
# webroot only for zygisk
98-
mkdir -p "$MODPATH/webroot"
99-
extract "$ZIPFILE" "webroot/index.html" "$MODPATH/webroot" true
100-
# evaluate if use awk or tr -s ' ' | cut -d' ' -f5
101-
SRCJS=$(unzip -l "$ZIPFILE" | grep "webroot/src" | grep -v sha256 | awk '{print $4}')
102-
extract "$ZIPFILE" "$SRCJS" "$MODPATH/webroot" true
95+
# extract only if KernelSU
96+
if [ "$KSU" ]; then
97+
# webroot only for zygisk
98+
mkdir -p "$MODPATH/webroot"
99+
extract "$ZIPFILE" "webroot/index.html" "$MODPATH/webroot" true
100+
# evaluate if use awk or tr -s ' ' | cut -d' ' -f5
101+
SRCJS=$(unzip -l "$ZIPFILE" | grep "webroot/src" | grep -v sha256 | awk '{print $4}')
102+
extract "$ZIPFILE" "$SRCJS" "$MODPATH/webroot" true
103+
fi
103104

105+
mkdir -p "$MODPATH/zygisk"
104106
if [ "$ARCH" = "arm" ] || [ "$ARCH" = "arm64" ]; then
105107
extract "$ZIPFILE" "lib/armeabi-v7a/liblspd.so" "$MODPATH/zygisk" true
106108
mv "$MODPATH/zygisk/liblspd.so" "$MODPATH/zygisk/armeabi-v7a.so"

0 commit comments

Comments
 (0)