Update abort function to cleanup module installs

CLose #2373
This commit is contained in:
topjohnwu
2020-03-22 00:08:04 -07:00
parent 31142180cb
commit 160ff7bb07
2 changed files with 18 additions and 7 deletions

View File

@ -39,13 +39,9 @@ fi
# Legacy Support
#################
# Global vars
TMPDIR=/dev/tmp
PERSISTDIR=/sbin/.magisk/mirror/persist
rm -rf $TMPDIR 2>/dev/null
mkdir -p $TMPDIR
is_legacy_script() {
unzip -l "$ZIPFILE" install.sh | grep -q install.sh
return $?
@ -64,6 +60,18 @@ print_modname() {
ui_print "*******************"
}
# Override abort as old scripts have some issues
abort() {
ui_print "$1"
$BOOTMODE || recovery_cleanup
[ -n $MODPATH ] && rm -rf $MODPATH
rm -rf $TMPDIR
exit 1
}
rm -rf $TMPDIR 2>/dev/null
mkdir -p $TMPDIR
# Preperation for flashable zips
setup_flashable