Skip to content

Commit fea7bfd

Browse files
committed
remove BL_BACKUP if it wasnt created
1 parent 6bf314d commit fea7bfd

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

app/src/main/java/org/andbootmgr/app/DeviceInfo.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ interface DeviceInfo {
2121
val codename: String
2222
val blBlock: String
2323
val metaonsd: Boolean
24+
/* Environment variables:
25+
* - BOOTED=true SETUP=false BL_BACKUP=<unset> for droidboot update
26+
* - BOOTED=false SETUP=false BL_BACKUP=<path> for droidboot fix
27+
* - BOOTED=false SETUP=true BL_BACKUP=<path> for droidboot install + sd creation
28+
* - BOOTED=true SETUP=true BL_BACKUP=<unset> for sd creation with already installed droidboot
29+
*/
2430
val postInstallScript: Boolean
2531
val havedtbo: Boolean
2632
fun isInstalled(logic: DeviceLogic): Boolean

app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,8 @@ private fun Flash(d: DroidBootFlowDataHolder) {
354354
terminal.add(vm.activity.getString(R.string.term_device_setup))
355355
vm.logic.runShFileWithArgs(
356356
"BOOTED=${vm.deviceInfo.isBooted(vm.logic)} SETUP=true " +
357-
"BL_BACKUP=${vm.logic.lkBackupPrimary.absolutePath} " +
357+
(if (vm.deviceInfo.isBooted(vm.logic)) "" else
358+
"BL_BACKUP=${vm.logic.lkBackupPrimary.absolutePath} ") +
358359
"${tmpFile!!.absolutePath} real"
359360
).to(terminal).exec()
360361
tmpFile.delete()

0 commit comments

Comments
 (0)