From 963d248cc7c3f8a4b6c345b5f1a1c695c0d483bb Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Sat, 23 Jan 2021 20:21:43 +0800 Subject: [PATCH] Rename apk to be uninstaller --- build.py | 1 - scripts/update_binary.sh | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.py b/build.py index fe1520f74..47bf9b2bf 100755 --- a/build.py +++ b/build.py @@ -506,7 +506,6 @@ def build_all(args): build_stub(args) build_binary(args) build_app(args) - zip_uninstaller(args) parser = argparse.ArgumentParser(description='Magisk build script') diff --git a/scripts/update_binary.sh b/scripts/update_binary.sh index 652a2cf15..9d297238f 100644 --- a/scripts/update_binary.sh +++ b/scripts/update_binary.sh @@ -15,4 +15,8 @@ export INSTALLER=$TMPDIR/install $BBBIN mkdir -p $INSTALLER $BBBIN unzip -o "$3" "assets/*" "lib/*" "META-INF/com/google/*" -x "lib/*/libbusybox.so" -d $INSTALLER >&2 export ASH_STANDALONE=1 -exec $BBBIN sh "$INSTALLER/META-INF/com/google/android/updater-script" "$@" +if [ "${3:-15}" = "uninstaller.zip" ]; then + exec $BBBIN sh "$INSTALLER/assets/magisk_uninstaller.sh" "$@" +else + exec $BBBIN sh "$INSTALLER/META-INF/com/google/android/updater-script" "$@" +fi