Commit c0ca99f4 authored by John Wu's avatar John Wu

Make sure APK exists before signing AVB 1.0

Check all possible APK locations before actually running the verification
parent 196f15d2
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
main() { main() {
# Magisk binaries # Magisk binaries
MAGISKBIN=/data/adb/magisk 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 mount /data 2>/dev/null
...@@ -43,7 +45,7 @@ main() { ...@@ -43,7 +45,7 @@ main() {
[ -z $BOOTIMAGE ] && abort "! Unable to detect boot image" [ -z $BOOTIMAGE ] && abort "! Unable to detect boot image"
ui_print "- Found boot image: $BOOTIMAGE" 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" $BOOTSIGNED && ui_print "- Boot image is signed with AVB 1.0"
SOURCEDMODE=true SOURCEDMODE=true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment