only when setup

Android-Boot-Manager · Jul 31, 2024 · fd64096 · fd64096
1 parent c9e0df0
commit fd64096
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/assets/Scripts b/app/src/main/assets/Scripts
diff --git a/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt b/app/src/main/java/org/andbootmgr/app/DroidBootFlow.kt
@@ -282,7 +282,7 @@ private fun Flash(vm: WizardActivityState) {
 		if (vm.deviceInfo.postInstallScript) {
 			terminal.add(vm.activity.getString(R.string.term_device_setup))
 			vm.logic.runShFileWithArgs(
-				"BOOTED=${vm.deviceInfo.isBooted(vm.logic)} " +
+				"BOOTED=${vm.deviceInfo.isBooted(vm.logic)} DOSETUP=true " +
 				"${File(vm.logic.assetDir, "Scripts/install/${vm.deviceInfo.codename}.sh").absolutePath} real"
 			).to(terminal).exec()
 		}

diff --git a/app/src/main/java/org/andbootmgr/app/FixDroidBootFlow.kt b/app/src/main/java/org/andbootmgr/app/FixDroidBootFlow.kt
@@ -62,6 +62,13 @@ private fun Flash(vm: WizardActivityState) {
 			terminal.add(if (e.message != null) e.message!! else "(null)")
 			terminal.add(vm.activity.getString(R.string.term_consult_doc))
 		}
+		if (vm.deviceInfo.postInstallScript) {
+			terminal.add(vm.activity.getString(R.string.term_device_setup))
+			vm.logic.runShFileWithArgs(
+				"BOOTED=${vm.deviceInfo.isBooted(vm.logic)} DOSETUP=false " +
+						"${File(vm.logic.assetDir, "Scripts/install/${vm.deviceInfo.codename}.sh").absolutePath} real"
+			).to(terminal).exec()
+		}
 		terminal.add(vm.activity.getString(R.string.term_success))
 		vm.activity.runOnUiThread {
 			vm.btnsOverride = true
+1 −0		install/mimameid.sh
+1 −0		install/vidofnir.sh
+1 −0		install/yggdrasilx.sh