Fix scripts

manager.sh + boot_patch.sh:
- all listed files from boot_patch.sh header are required for boot patching, but stub.apk was being removed so install_magisk via addon.d.sh would fail without it; leave it in place

addon.d.sh:
- remove old redundant recovery_actions call (it's also performed by setup_flashable in initialize)
- print ABI to match flash_script.sh output

boot_patch.sh:
- catch and abort on any errors from ramdisk.cpio patching in the future

util_functions.sh:
- fix hiding of mount_partitions /system_root umount stderr
- quote mount_apex .pb DEST name parsing charset for safety even though both work

Fixes #6828
This commit is contained in:
osm0sis
2023-04-05 22:53:55 -03:00
committed by John Wu
parent a70c73bffd
commit 18fe0e6442
4 changed files with 10 additions and 11 deletions

View File

@ -80,8 +80,6 @@ main() {
mkdir -p $TMPDIR
cd $TMPDIR
$BOOTMODE || recovery_actions
if echo $MAGISK_VER | grep -q '\.'; then
PRETTY_VER=$MAGISK_VER
else
@ -104,13 +102,14 @@ main() {
fi
find_boot_image
[ -z $BOOTIMAGE ] && abort "! Unable to detect target image"
ui_print "- Target image: $BOOTIMAGE"
api_level_arch_detect
ui_print "- Device platform: $ABI"
remove_system_su
find_magisk_apk
api_level_arch_detect
install_magisk
# Cleanups