Min ver is 19.0, don't need legacy commands

This commit is contained in:
topjohnwu 2020-02-29 15:41:15 -08:00
parent ee1f45aa91
commit faf077b494

View File

@ -164,7 +164,7 @@ abstract class MagiskInstallImpl : FlashResultListener {
FileOutputStream(extract).use { tarIn.copyTo(it) } FileOutputStream(extract).use { tarIn.copyTo(it) }
if (name.contains(".lz4")) { if (name.contains(".lz4")) {
console.add("-- Decompressing: $name") console.add("-- Decompressing: $name")
"./magiskboot --decompress $extract".sh() "./magiskboot decompress $extract".sh()
} }
} else if (entry.name.contains("vbmeta.img")) { } else if (entry.name.contains("vbmeta.img")) {
vbmeta = true vbmeta = true
@ -189,9 +189,9 @@ abstract class MagiskInstallImpl : FlashResultListener {
srcBoot = recovery.path srcBoot = recovery.path
// Repack boot image to prevent restore // Repack boot image to prevent restore
arrayOf( arrayOf(
"./magiskboot --unpack boot.img", "./magiskboot unpack boot.img",
"./magiskboot --repack boot.img", "./magiskboot repack boot.img",
"./magiskboot --cleanup", "./magiskboot cleanup",
"mv new-boot.img boot.img").sh() "mv new-boot.img boot.img").sh()
SuFileInputStream(boot).use { SuFileInputStream(boot).use {
tarOut.putNextEntry(newEntry("boot.img", boot.length())) tarOut.putNextEntry(newEntry("boot.img", boot.length()))
@ -259,7 +259,7 @@ abstract class MagiskInstallImpl : FlashResultListener {
} }
val job = Shell.sh( val job = Shell.sh(
"./magiskboot --cleanup", "./magiskboot cleanup",
"mv bin/busybox busybox", "mv bin/busybox busybox",
"rm -rf magisk.apk bin boot.img update-binary", "rm -rf magisk.apk bin boot.img update-binary",
"cd /") "cd /")