new scripts abi part 1

Android-Boot-Manager · Jul 31, 2024 · 90a0fbd · 90a0fbd
1 parent 5b49fa0
commit 90a0fbd
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 32 deletions.
diff --git a/app/src/main/assets/Scripts b/app/src/main/assets/Scripts
diff --git a/app/src/main/assets/cp/app_install.sh b/app/src/main/assets/cp/app_install.sh
diff --git a/app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt b/app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt
@@ -464,7 +464,7 @@ private fun Os(c: CreatePartDataHolder) {
 	}
 
 	LaunchedEffect(Unit) {
-		val a = SuFile.open("/data/abm/bootset/db/entries/").list()!!.toMutableList()
+		val a = SuFile.open(c.vm.logic.abmEntries.absolutePath).list()!!.toMutableList()
 		a.removeIf { c -> !(c.startsWith("rom") && c.endsWith(".conf") && c.substring(3, c.length - 5).matches(Regex("\\d+"))) }
 		a.sortWith(Comparator.comparingInt { c -> c.substring(3, c.length - 5).toInt() })
 		val b = if (a.size > 0) a.last().substring(3, a.last().length - 5).toInt() + 1 else 0

diff --git a/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt b/app/src/main/java/org/andbootmgr/app/DeviceInfo.kt
@@ -74,17 +74,6 @@ object HardcodedDeviceInfoFactory {
 		}
 	}
 
-	private fun getCedric(): DeviceInfo {
-		return object : MetaOnSdDeviceInfo() {
-			override val codename: String = "cedric"
-			override val blBlock: String = "/dev/block/bootdevice/by-name/boot"
-			override val bdev: String = "/dev/block/mmcblk1"
-			override val pbdev: String = bdev + "p"
-			override val postInstallScript: Boolean = true
-			override val havedtbo: Boolean = false
-		}
-	}
-
 	private fun getMimameid(): DeviceInfo {
 		return object : MetaOnSdDeviceInfo() {
 			override val codename: String = "mimameid"
@@ -133,7 +122,6 @@ object HardcodedDeviceInfoFactory {
 		return when (codename) {
 			"yggdrasil" -> getYggdrasil()
 			"yggdrasilx" -> getYggdrasilx()
-			"cedric" -> getCedric()
 			"mimameid" -> getMimameid()
 			"vidofnir" -> getVidofnir()
 			"vayu" -> getVayu()

diff --git a/app/src/main/java/org/andbootmgr/app/DeviceLogic.kt b/app/src/main/java/org/andbootmgr/app/DeviceLogic.kt
@@ -9,6 +9,7 @@ import java.io.File
 class DeviceLogic(ctx: Context) {
 	private val rootDir = ctx.filesDir.parentFile!!
 	val assetDir = File(rootDir, "assets")
+	private val toolkitDir = File(assetDir, "Toolkit")
 	val fileDir = File(rootDir, "files")
 	val cacheDir = File(rootDir, "cache")
 	val abmBootset = File(fileDir, "bootset")
@@ -75,4 +76,9 @@ class DeviceLogic(ctx: Context) {
 	fun create(p: SDUtils.Partition.FreeSpace, start: Long, end: Long, typeCode: String, name: String): Shell.Job {
 		return Shell.cmd(SDUtils.umsd(p.meta) + " && " + p.create(start, end, typeCode, name))
 	}
+	fun runShFileWithArgs(cmd: String): Shell.Job {
+		return Shell.cmd("export PATH=\"${toolkitDir.absolutePath}:\$PATH\" " +
+				"TMPDIR=\"${cacheDir.absolutePath}\" BOOTSET=\"${abmBootset.absolutePath}\" " +
+				"TK=\"${toolkitDir.absolutePath}\" && cd \"\$TK\" && $cmd")
+	}
 }
diff --git a/app/src/main/java/org/andbootmgr/app/FixDroidBootFlow.kt b/app/src/main/java/org/andbootmgr/app/FixDroidBootFlow.kt
@@ -54,7 +54,7 @@ private fun Flash(vm: WizardActivityState) {
 		val f = SuFile.open(vm.deviceInfo!!.blBlock)
 		if (!f.canWrite())
 			terminal.add(vm.activity.getString(R.string.term_cant_write_bl))
-		vm.copyPriv(SuFileInputStream.open(vm.deviceInfo.blBlock), File(vm.logic.abmDir, "backup_lk.img"))
+		vm.copyPriv(SuFileInputStream.open(vm.deviceInfo.blBlock), File(vm.logic.fileDir, "backup_lk.img"))
 		try {
 			vm.copyPriv(vm.flashStream(flashType), File(vm.deviceInfo.blBlock))
 		} catch (e: IOException) {

diff --git a/app/src/main/java/org/andbootmgr/app/UpdateFlow.kt b/app/src/main/java/org/andbootmgr/app/UpdateFlow.kt
@@ -243,7 +243,7 @@ private fun Flash(u: UpdateFlowDataHolder) {
     Terminal(u.vm, logFile = "update_${System.currentTimeMillis()}.txt") { terminal ->
         val sp = u.e!!["xpart"]!!.split(":")
         val meta = SDUtils.generateMeta(u.vm.deviceInfo!!)!!
-        Shell.cmd(SDUtils.umsd(SDUtils.generateMeta(u.vm.deviceInfo)!!)).exec()
+        Shell.cmd(SDUtils.umsd(meta)).exec()
 
         if (u.hasUpdate) { // online
             u.vm.btnsOverride = true
@@ -309,7 +309,7 @@ private fun Flash(u: UpdateFlowDataHolder) {
                     terminal.add(u.vm.activity.getString(R.string.term_patch_update))
                     var cmd = "FORMATDATA=false " + File(
                         u.vm.logic.assetDir,
-                        "Scripts/add_os/${u.vm.deviceInfo!!.codename}/${u.script}"
+                        "Scripts/add_os/${u.vm.deviceInfo.codename}/${u.script}"
                     ).absolutePath + " ${u.ef!!.nameWithoutExtension}"
                     for (i in bootfile) {
                         cmd += " " + i.absolutePath

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -191,7 +191,6 @@
     <string name="term_cant_write_bl">Info: kann wahrscheinlich nicht den Bootloader überschreiben</string>
     <string name="term_consult_doc">-- Bitte schlage diese Fehler in der Dokumentation nach, um die Installation zu beenden.</string>
     <string name="term_preparing_fs">Bereite Dateisystem vor…</string>
-    <string name="term_cant_create_abm_dir">-- konnte /data/abm nicht erstellen, breche ab</string>
     <string name="term_cant_create_mount_point">-- konnte Einhängepunkt nicht erstellen, breche ab</string>
     <string name="term_cant_create_placeholder">-- konnte Platzhalter nicht erstellen, breche ab</string>
     <string name="term_cant_get_meta">-- konnte Meta nicht bekommen, breche ab</string>

diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
@@ -191,7 +191,6 @@
     <string name="term_mount_state_bad">-- status muat tidak konsisten, membatalkan</string>
     <string name="term_failed_umount_drive">-- peringatan: gagal melepas penyimpanan</string>
     <string name="term_preparing_fs">Menyiapkan berkas sistem…</string>
-    <string name="term_cant_create_abm_dir">-- gagal membuat direktori /data/abm, membatalkan</string>
     <string name="term_cant_get_meta">-- gagal mendapatkan meta, membatalkan</string>
     <string name="term_invalid_action">Tindakan tidak valid, tidak ada yang diubah</string>
     <string name="term_contact_support">-- Mohon hubungi pusat dukungan</string>

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -156,7 +156,6 @@
     <string name="term_bl_failed">-- Falha ao instalar bootloader pois:</string>
     <string name="term_consult_doc">-- Consulte a documentação para finalizar a instalação.</string>
     <string name="term_preparing_fs">Preparando o sistema de arquivos…</string>
-    <string name="term_cant_create_abm_dir">-- falha ao criar /data/ABM. Abortando</string>
     <string name="term_cant_create_mount_point">-- falha ao criar ponto de montagem. Abortando</string>
     <string name="term_cant_create_placeholder">-- falha ao criar espaço reservado. Abortando</string>
     <string name="term_cant_get_meta">-- falha ao carregar meta. Abortando</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -201,7 +201,6 @@
     <string name="term_bl_failed">-- Не удалось прошить загрузчик, причина:</string>
     <string name="term_preparing_fs">Подготовка файловой системы…</string>
     <string name="term_mount_state_bad">-- несоответсвующее состояние монтирования, прерывание</string>
-    <string name="term_cant_create_abm_dir">-- не удалось создать /data/abm, прерывание</string>
     <string name="term_cant_create_placeholder">-- не удалось создать placeholder, прерывание</string>
     <string name="term_cant_get_meta">-- не удалось получить мета, прерывание</string>
     <string name="term_failed_create_pt">-- не удалось создать таблицу разделов, прерывание</string>

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -180,7 +180,6 @@
     <string name="term_bl_failed">-- Önyükleyiciyi yüklerken hata, sebep:</string>
     <string name="term_consult_doc">-- Lütfen yüklemeyi bitirene kadar dokümanlara uyunuz.</string>
     <string name="term_preparing_fs">Dosya sistemi hazırlanıyor…</string>
-    <string name="term_cant_create_abm_dir">-- /data/abm oluşturulamadı, iptal ediliyor</string>
     <string name="term_cant_create_placeholder">-- yer tutucu oluşturulamadı, iptal ediliyor</string>
     <string name="term_mount_state_bad">-- geçersiz bağlama durumu, iptal ediliyor</string>
     <string name="term_failed_create_pt">-- bölüm tablosu oluşturulamadı, iptal ediliyor</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -55,7 +55,6 @@
     <string name="term_cant_umount">Неможливо розмонтувати. Нічого не було змінено</string>
     <string name="term_backup_restore_fail">-- Не вдалося зарезервувати/відновити, причина:</string>
     <string name="term_consult_doc">-- Просимо проконсультуватись з документацією для завершення інсталяції.</string>
-    <string name="term_cant_create_abm_dir">-- не вдалося створити /data/abm, процес зупинено</string>
     <string name="term_cant_get_meta">-- не вдалося отримати meta, процес перервано</string>
     <string name="term_failed_create_pt">-- не вдалося створити partition table, процес зупинено</string>
     <string name="term_mount_failure_inconsist">-- помилка монтування, процес зупинено</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -194,7 +194,6 @@
 	<string name="term_consult_doc">-- Please consult documentation to finish the install.</string>
 	<string name="term_preparing_fs">Preparing file system…</string>
 	<string name="term_mount_state_bad">-- inconsistent mount state, aborting</string>
-	<string name="term_cant_create_abm_dir">-- failed to create /data/abm, aborting</string>
 	<string name="term_cant_create_mount_point">-- failed to create mount point, aborting</string>
 	<string name="term_cant_create_placeholder">-- failed to create placeholder, aborting</string>
 	<string name="term_cant_get_meta">-- failed to get meta, aborting</string>