From dce87a8a3ca563452773b19b00969cc4c70b62ab Mon Sep 17 00:00:00 2001
From: "L.S.S." <30771484+lss4@users.noreply.github.com>
Date: Fri, 13 Oct 2023 01:25:19 +0900
Subject: [PATCH] Update build.sh. Use local module-installer.sh, as well as
 produce packages for both /product and /vendor.

---
 build.sh | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 864f483..a58685f 100755
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,34 @@ fi
 echo "Building overlay APK"
 ( cd build && ./build.sh ../MulchWebView/Android.mk )
 
-echo "Building flashable package (zip)"
+## vendor/overlay (A12 and before)
+
+echo "Building flashable package (vendor/overlay)"
+mkdir -p build/.temp
+mkdir -p build/.temp/META-INF/com/google/android
+cp update-binary build/.temp/META-INF/com/google/android
+echo "# Dummy file; update-binary is a shell script." > build/.temp/META-INF/com/google/android/updater-script
+mkdir -p build/.temp/system/addon.d
+cp 99-mulch-webview.sh build/.temp/system/addon.d
+mkdir -p build/.temp/vendor/overlay
+cp build/treble-overlay-mulch-webview.apk build/.temp/vendor/overlay
+( cd build/.temp && zip -r - . > ../MulchSystemWebViewOverlay-vendor.zip . ) &> /dev/null
+rm -r build/.temp
+
+echo "Building Magisk module (vendor/overlay)"
+mkdir -p build/.temp
+mkdir -p build/.temp/META-INF/com/google/android
+cp module_installer.sh build/.temp/META-INF/com/google/android/update-binary
+echo "#MAGISK" > build/.temp/META-INF/com/google/android/updater-script
+mkdir -p build/.temp/system/vendor/overlay
+cp build/treble-overlay-mulch-webview.apk build/.temp/system/vendor/overlay
+cp module.prop build/.temp/
+( cd build/.temp && zip -r - . > ../MulchSystemWebViewMagisk-vendor.zip . ) &> /dev/null
+rm -r build/.temp
+
+## product/overlay (A13 and onwards)
+
+echo "Building flashable package (product/overlay)"
 mkdir -p build/.temp
 mkdir -p build/.temp/META-INF/com/google/android
 cp update-binary build/.temp/META-INF/com/google/android
@@ -19,17 +46,16 @@ mkdir -p build/.temp/system/addon.d
 cp 99-mulch-webview.sh build/.temp/system/addon.d
 mkdir -p build/.temp/product/overlay
 cp build/treble-overlay-mulch-webview.apk build/.temp/product/overlay
-( cd build/.temp && zip -r - . > ../MulchSystemWebViewOverlay.zip . ) &> /dev/null
+( cd build/.temp && zip -r - . > ../MulchSystemWebViewOverlay-product.zip . ) &> /dev/null
 rm -r build/.temp
 
-echo "Building Magisk module (zip)"
+echo "Building Magisk module (product/overlay)"
 mkdir -p build/.temp
 mkdir -p build/.temp/META-INF/com/google/android
-curl -sL https://github.com/topjohnwu/Magisk/raw/master/scripts/module_installer.sh > build/.temp/META-INF/com/google/android/update-binary
-test -s build/.temp/META-INF/com/google/android/update-binary
+cp module_installer.sh build/.temp/META-INF/com/google/android/update-binary
 echo "#MAGISK" > build/.temp/META-INF/com/google/android/updater-script
 mkdir -p build/.temp/system/product/overlay
 cp build/treble-overlay-mulch-webview.apk build/.temp/system/product/overlay
 cp module.prop build/.temp/
-( cd build/.temp && zip -r - . > ../MulchSystemWebViewMagisk.zip . ) &> /dev/null
+( cd build/.temp && zip -r - . > ../MulchSystemWebViewMagisk-product.zip . ) &> /dev/null
 rm -r build/.temp