scripts: only show addon.d error once on failures

This commit is contained in:
Chris Renshaw 2020-04-02 13:42:38 -03:00 committed by John Wu
parent 834561a5de
commit 2742edd73f

View File

@ -12,7 +12,7 @@ trampoline() {
if [ -f $MAGISKBIN/addon.d.sh ]; then if [ -f $MAGISKBIN/addon.d.sh ]; then
exec sh $MAGISKBIN/addon.d.sh "$@" exec sh $MAGISKBIN/addon.d.sh "$@"
exit $? exit $?
else elif [ "$1" = post-restore ]; then
ps | grep zygote | grep -v grep >/dev/null && BOOTMODE=true || BOOTMODE=false ps | grep zygote | grep -v grep >/dev/null && BOOTMODE=true || BOOTMODE=false
$BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMODE=true $BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMODE=true
@ -31,8 +31,8 @@ trampoline() {
ui_print "***********************" ui_print "***********************"
ui_print "! Cannot find Magisk binaries - was data wiped or not decrypted?" ui_print "! Cannot find Magisk binaries - was data wiped or not decrypted?"
ui_print "! Reflash OTA from decrypted recovery or reflash Magisk" ui_print "! Reflash OTA from decrypted recovery or reflash Magisk"
exit 1
fi fi
exit 1
} }
# Always use the script in /data # Always use the script in /data