MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure APK exists before signing AVB 1.0

Browse Source 
Check all possible APK locations before actually running the verification
This commit is contained in:
John Wu 2018-06-20 05:16:43 +08:00
parent 196f15d240
commit c0ca99f4b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/addon.d.sh
View File

@ -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() {
[ -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