From cfadfcf6d6d14f734f75bcbb7fe89aeadef6d467 Mon Sep 17 00:00:00 2001
From: FriendlyNeighborhoodShane <shane.880088.supw@gmail.com>
Date: Sat, 12 Jun 2021 13:02:24 +0530
Subject: [PATCH] pre_install_actions: run after archive extraction

---
 conf/defconf-minimal.txt                      |  1 -
 conf/defconf-minimaliap.txt                   |  1 -
 conf/defconf-nogoolag.txt                     |  1 -
 conf/defconf-standard.txt                     |  1 -
 conf/defconf-unlp.txt                         |  1 -
 src/META-INF/com/google/android/update-binary | 10 +++++-----
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/conf/defconf-minimal.txt b/conf/defconf-minimal.txt
index c1954bb..b4c88ef 100644
--- a/conf/defconf-minimal.txt
+++ b/conf/defconf-minimal.txt
@@ -160,7 +160,6 @@ post_build_actions() {
 
 pre_install_actions() {
 
-  unzip -o "$zipfile" "util/func-defconf.sh" -d "$filedir/";
   . "$filedir/util/func-defconf.sh";
   user_conf;
   microg_cleanup;
diff --git a/conf/defconf-minimaliap.txt b/conf/defconf-minimaliap.txt
index 994be9a..3ec2a04 100644
--- a/conf/defconf-minimaliap.txt
+++ b/conf/defconf-minimaliap.txt
@@ -160,7 +160,6 @@ post_build_actions() {
 
 pre_install_actions() {
 
-  unzip -o "$zipfile" "util/func-defconf.sh" -d "$filedir/";
   . "$filedir/util/func-defconf.sh";
   user_conf;
   microg_cleanup;
diff --git a/conf/defconf-nogoolag.txt b/conf/defconf-nogoolag.txt
index ac27be1..3f8d82f 100644
--- a/conf/defconf-nogoolag.txt
+++ b/conf/defconf-nogoolag.txt
@@ -169,7 +169,6 @@ post_build_actions() {
 
 pre_install_actions() {
 
-  unzip -o "$zipfile" "util/func-defconf.sh" -d "$filedir/";
   . "$filedir/util/func-defconf.sh";
   user_conf;
   microg_cleanup;
diff --git a/conf/defconf-standard.txt b/conf/defconf-standard.txt
index c90936b..6be2240 100644
--- a/conf/defconf-standard.txt
+++ b/conf/defconf-standard.txt
@@ -175,7 +175,6 @@ post_build_actions() {
 
 pre_install_actions() {
 
-  unzip -o "$zipfile" "util/func-defconf.sh" -d "$filedir/";
   . "$filedir/util/func-defconf.sh";
   user_conf;
   microg_cleanup;
diff --git a/conf/defconf-unlp.txt b/conf/defconf-unlp.txt
index 1ff491f..b4a2c16 100644
--- a/conf/defconf-unlp.txt
+++ b/conf/defconf-unlp.txt
@@ -143,7 +143,6 @@ post_build_actions() {
 
 pre_install_actions() {
 
-  unzip -o "$zipfile" "util/func-defconf.sh" -d "$filedir/";
   . "$filedir/util/func-defconf.sh";
   user_conf;
   microg_cleanup;
diff --git a/src/META-INF/com/google/android/update-binary b/src/META-INF/com/google/android/update-binary
index 4accbca..8e186ae 100644
--- a/src/META-INF/com/google/android/update-binary
+++ b/src/META-INF/com/google/android/update-binary
@@ -431,6 +431,11 @@ fi;
 
 if [ "$action" = "installation" ]; then
 
+  ui_print " ";
+  ui_print "Extracting files...";
+  mkdir -p "$filedir";
+  unzip -o "$zipfile" -d "$filedir" || abort "Could not unzip $zipfile";
+
   pre_install_actions;
 
   ui_print " ";
@@ -452,11 +457,6 @@ if [ "$action" = "installation" ]; then
     chcon -hR 'u:object_r:media_rw_data_file:s0' "$backupdir";
   }
 
-  ui_print " ";
-  ui_print "Extracting files...";
-  mkdir -p "$filedir";
-  unzip -o "$zipfile" -d "$filedir" || abort "Could not unzip $zipfile";
-
   ui_print " ";
   ui_print "Doing size checks...";
   packsize=0;