From 6141bb5bb322c0d801abafccb3fb9426990b0c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=8B=E9=A1=B5?= Date: Thu, 20 Jul 2023 11:27:28 +0800 Subject: [PATCH] Fix MagiskInstaller.patchBoot() error catching --- .../com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt index 882ab9968..314a46c4c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt @@ -493,11 +493,12 @@ abstract class MagiskInstallImpl protected constructor( "PATCHVBMETAFLAG=${Config.patchVbmeta} " + "RECOVERYMODE=${Config.recovery} " + "SYSTEM_ROOT=${Info.isSAR} " + - "sh boot_patch.sh $srcBoot", - "./magiskboot cleanup", - "cd /") + "sh boot_patch.sh $srcBoot") + val isSuccess = cmds.sh().isSuccess - return cmds.sh().isSuccess + shell.newJob().add("./magiskboot cleanup", "cd /").exec() + + return isSuccess } private fun flashBoot() = "direct_install $installDir $srcBoot".sh().isSuccess