From 1f80f8e27ec07b3a85fac5a9ed2eb70acd99f24b Mon Sep 17 00:00:00 2001
From: Gabriel2392 <gabriel824m@gmail.com>
Date: Thu, 18 Aug 2022 19:14:58 +0200
Subject: [PATCH] universal7885: use post-install script

---
 universal7885-common/releasetools/Android.mk        |  1 +
 universal7885-common/releasetools/eureka_install.sh |  7 +++++++
 universal7885-common/releasetools/releasetools.py   | 12 ++++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100755 universal7885-common/releasetools/eureka_install.sh

diff --git a/universal7885-common/releasetools/Android.mk b/universal7885-common/releasetools/Android.mk
index 3a18b6a..64ec7eb 100644
--- a/universal7885-common/releasetools/Android.mk
+++ b/universal7885-common/releasetools/Android.mk
@@ -1,2 +1,3 @@
 LOCAL_PATH := $(call my-dir)
 $(call add-radio-file,eureka_dtb.img)
+$(call add-radio-file,eureka_install.sh)
diff --git a/universal7885-common/releasetools/eureka_install.sh b/universal7885-common/releasetools/eureka_install.sh
new file mode 100755
index 0000000..61eeb51
--- /dev/null
+++ b/universal7885-common/releasetools/eureka_install.sh
@@ -0,0 +1,7 @@
+#!/sbin/sh
+mount /vendor
+mount -o rw,remount /vendor
+rm -rf /vendor/recovery-from-boot*
+umount /vendor
+rm -f /tmp/eureka_install.sh
+exit 0
diff --git a/universal7885-common/releasetools/releasetools.py b/universal7885-common/releasetools/releasetools.py
index 1d15b24..feea556 100644
--- a/universal7885-common/releasetools/releasetools.py
+++ b/universal7885-common/releasetools/releasetools.py
@@ -30,14 +30,18 @@ def AddImage(info, folder, basename, dest):
   common.ZipWriteStr(info.output_zip, name, data)
   info.script.AppendExtra('package_extract_file("%s", "%s");' % (name, dest))
 
+def AddFile(info, folder, basename):
+  name = basename
+  data = info.input_zip.read(folder + basename)
+  common.ZipWriteStr(info.output_zip, name, data)
+
 def PrintInfo(info, dest):
   info.script.Print("Patching {} image unconditionally...".format(dest.split('/')[-1]))
 
 def OTA_InstallEnd(info):
   AddImage(info, "RADIO/", "eureka_dtb.img", "/dev/block/platform/13500000.dwmmc0/by-name/dtb")
   AddImage(info, "RADIO/", "eureka_dtbo.img", "/dev/block/platform/13500000.dwmmc0/by-name/dtbo")
-  info.script.AppendExtra('run_program("/sbin/mount", "/vendor");')
-  info.script.AppendExtra('run_program("/sbin/mount", "-o", "rw,remount", "/vendor");')
-  info.script.AppendExtra('run_program("/sbin/rm", "-rf", "/vendor/recovery-from-boot.p");')
-  info.script.AppendExtra('run_program("/sbin/umount", "/vendor");')
+  AddFile(info, "RADIO/", "eureka_install.sh")
+  info.script.AppendExtra('package_extract_file("eureka_install.sh", "/tmp/eureka_install.sh");')
+  info.script.AppendExtra('run_program("/sbin/sh", "/tmp/eureka_install.sh");')
   return