From fea7bfdb5b04de1ed38ff3d5b5600868394f73ad Mon Sep 17 00:00:00 2001 From: nift4 Date: Sat, 18 Jan 2025 18:26:54 +0100 Subject: [PATCH] remove BL_BACKUP if it wasnt created --- app/src/main/java/org/andbootmgr/app/DeviceInfo.kt | 6 ++++++ app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt b/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt index cac3b595..9f12241e 100644 --- a/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt +++ b/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt @@ -21,6 +21,12 @@ interface DeviceInfo { val codename: String val blBlock: String val metaonsd: Boolean + /* Environment variables: + * - BOOTED=true SETUP=false BL_BACKUP= for droidboot update + * - BOOTED=false SETUP=false BL_BACKUP= for droidboot fix + * - BOOTED=false SETUP=true BL_BACKUP= for droidboot install + sd creation + * - BOOTED=true SETUP=true BL_BACKUP= for sd creation with already installed droidboot + */ val postInstallScript: Boolean val havedtbo: Boolean fun isInstalled(logic: DeviceLogic): Boolean diff --git a/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt b/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt index a0795d6e..4eee6cd1 100644 --- a/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt +++ b/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt @@ -354,7 +354,8 @@ private fun Flash(d: DroidBootFlowDataHolder) { terminal.add(vm.activity.getString(R.string.term_device_setup)) vm.logic.runShFileWithArgs( "BOOTED=${vm.deviceInfo.isBooted(vm.logic)} SETUP=true " + - "BL_BACKUP=${vm.logic.lkBackupPrimary.absolutePath} " + + (if (vm.deviceInfo.isBooted(vm.logic)) "" else + "BL_BACKUP=${vm.logic.lkBackupPrimary.absolutePath} ") + "${tmpFile!!.absolutePath} real" ).to(terminal).exec() tmpFile.delete()