From c0ca99f4b463c27f3ece39ed5fbbd18e2bb25125 Mon Sep 17 00:00:00 2001 From: John Wu Date: Wed, 20 Jun 2018 05:16:43 +0800 Subject: [PATCH] Make sure APK exists before signing AVB 1.0 Check all possible APK locations before actually running the verification --- scripts/addon.d.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/addon.d.sh b/scripts/addon.d.sh index 9dcf2921b..3bc774096 100644 --- a/scripts/addon.d.sh +++ b/scripts/addon.d.sh @@ -13,7 +13,9 @@ main() { # Magisk binaries MAGISKBIN=/data/adb/magisk - APK=/data/magisk.apk + APK=/data/adb/magisk.apk + [ -f $APK ] || APK=/data/magisk/magisk.apk + [ -f $APK ] || APK=/data/app/com.topjohnwu.magisk*/*.apk mount /data 2>/dev/null @@ -43,7 +45,7 @@ main() { [ -z $BOOTIMAGE ] && abort "! Unable to detect boot image" ui_print "- Found boot image: $BOOTIMAGE" - eval $BOOTSIGNER -verify < $BOOTIMAGE && BOOTSIGNED=true + [ -f $APK ] && eval $BOOTSIGNER -verify < $BOOTIMAGE && BOOTSIGNED=true $BOOTSIGNED && ui_print "- Boot image is signed with AVB 1.0" SOURCEDMODE=true