From 2fcc7e6c218a86c0ae736e0659f7263eb1d060d6 Mon Sep 17 00:00:00 2001 From: osm0sis Date: Fri, 26 May 2017 22:24:45 -0300 Subject: [PATCH] Backend: don't check anykernel.sh before it's been extracted - if it does not exist yet (i.e. hasn't been extracted) then assume cleanuponabort=1 since there wouldn't be anything to see on a failed extraction - hide any missing file errors from file_getprop here now that we've taken care of that case --- META-INF/com/google/android/update-binary | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary index bba2357..9286524 100755 --- a/META-INF/com/google/android/update-binary +++ b/META-INF/com/google/android/update-binary @@ -24,11 +24,13 @@ set_perm_recursive() { file_getprop() { grep "^$2" "$1" | cut -d= -f2; } getprop() { test -e /sbin/getprop && /sbin/getprop $1 || file_getprop /default.prop $1; } cleanup() { rm -rf /tmp/anykernel; } -if [ "$(file_getprop /tmp/anykernel/anykernel.sh do.cleanuponabort)" == 1 ]; then - abort() { ui_print "$*"; cleanup; umount /system; umount /data; exit 1; } +abort() { + if [ ! -f /tmp/anykernel/anykernel.sh -o "$(file_getprop /tmp/anykernel/anykernel.sh do.cleanuponabort 2>/dev/null)" == 1 ]; then + ui_print "$*"; cleanup; umount /system; umount /data; exit 1; else - abort() { ui_print "$*"; umount /system; umount /data; exit 1; } -fi; + ui_print "$*"; umount /system; umount /data; exit 1; + fi; +} show_progress 1.34 4; ui_print " ";