From ef26e8ead9fe1c8b2c4aa27d4b7046b0677d5477 Mon Sep 17 00:00:00 2001
From: Guillaume Castagnino <casta@xwing.info>
Date: Thu, 17 Jun 2021 17:03:56 +0200
Subject: [PATCH] =?UTF-8?q?fix=20probl=C3=A8mes=20de=20prot=C3=A9e=20de=20?=
 =?UTF-8?q?la=20fonction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 META-INF/com/google/android/update-binary                   | 5 -----
 dist-font/cm-data/99-font.sh.addon                          | 6 +++++-
 dist-font/cm.sh                                             | 2 ++
 .../cm-data/99-perso-google-clean-more.sh.addon             | 6 +++++-
 dist-google-more/cm.sh                                      | 2 ++
 dist-google/cm-data/99-perso-google-clean.sh.addon          | 6 +++++-
 dist-google/cm.sh                                           | 2 ++
 dist-std/cm-data/99-perso.sh.addon                          | 6 +++++-
 dist-std/cm.sh                                              | 2 ++
 9 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index ecebfa4..3acfd5e 100755
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -59,11 +59,6 @@ find_block() {
   fi
 }
 
-get_output_path() {
-  # In recovery we mounted all partitions in the right place, so we can rely on symlinks
-  echo "$1"
-}
-
 cd /tmp
 unzip -o "$3"
 
diff --git a/dist-font/cm-data/99-font.sh.addon b/dist-font/cm-data/99-font.sh.addon
index 2486257..cdd555f 100755
--- a/dist-font/cm-data/99-font.sh.addon
+++ b/dist-font/cm-data/99-font.sh.addon
@@ -18,7 +18,11 @@ else
   S=$SYSTEM
   SYS=$SYSTEM
   # PRODUCT AND SYSTEM_EXT defined from recovery
-  # get_output_path is no-op function defined from recovery
+
+  get_output_path() {
+    # In recovery we mounted all partitions in the right place, so we can rely on symlinks
+    echo "$1"
+  }
 fi
 
 # path is needed when running from recovery (at install)
diff --git a/dist-font/cm.sh b/dist-font/cm.sh
index 73ffd06..7b6fc0b 100755
--- a/dist-font/cm.sh
+++ b/dist-font/cm.sh
@@ -24,6 +24,8 @@ chmod 755 ${SYSTEM}/addon.d/99-font.sh
 
 # call restore script post to remove bloat
 export SYSTEM
+export PRODUCT
+export SYSTEM_EXT
 ${SYSTEM}/addon.d/99-font.sh post-restore
 
 echo "Done"
diff --git a/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon b/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
index 16aabfc..4cad7a6 100755
--- a/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
+++ b/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
@@ -18,7 +18,11 @@ else
   S=$SYSTEM
   SYS=$SYSTEM
   # PRODUCT AND SYSTEM_EXT defined from recovery
-  # get_output_path is no-op function defined from recovery
+
+  get_output_path() {
+    # In recovery we mounted all partitions in the right place, so we can rely on symlinks
+    echo "$1"
+  }
 fi
 
 # path is needed when running from recovery (at install)
diff --git a/dist-google-more/cm.sh b/dist-google-more/cm.sh
index faa83fa..1541ffb 100755
--- a/dist-google-more/cm.sh
+++ b/dist-google-more/cm.sh
@@ -18,6 +18,8 @@ chmod 755 ${SYSTEM}/addon.d/99-perso-google-clean-more.sh
 
 # call restore script post to remove bloat
 export SYSTEM
+export PRODUCT
+export SYSTEM_EXT
 ${SYSTEM}/addon.d/99-perso-google-clean-more.sh post-restore
 
 echo "Done"
diff --git a/dist-google/cm-data/99-perso-google-clean.sh.addon b/dist-google/cm-data/99-perso-google-clean.sh.addon
index 8b93a77..f55693b 100755
--- a/dist-google/cm-data/99-perso-google-clean.sh.addon
+++ b/dist-google/cm-data/99-perso-google-clean.sh.addon
@@ -18,7 +18,11 @@ else
   S=$SYSTEM
   SYS=$SYSTEM
   # PRODUCT AND SYSTEM_EXT defined from recovery
-  # get_output_path is no-op function defined from recovery
+
+  get_output_path() {
+    # In recovery we mounted all partitions in the right place, so we can rely on symlinks
+    echo "$1"
+  }
 fi
 
 # path is needed when running from recovery (at install)
diff --git a/dist-google/cm.sh b/dist-google/cm.sh
index 9104bd8..1c3ef0a 100755
--- a/dist-google/cm.sh
+++ b/dist-google/cm.sh
@@ -18,6 +18,8 @@ chmod 755 ${SYSTEM}/addon.d/99-perso-google-clean.sh
 
 # call restore script post to remove bloat
 export SYSTEM
+export PRODUCT
+export SYSTEM_EXT
 ${SYSTEM}/addon.d/99-perso-google-clean.sh post-restore
 
 echo "Done"
diff --git a/dist-std/cm-data/99-perso.sh.addon b/dist-std/cm-data/99-perso.sh.addon
index f6d6daa..55e0cb6 100755
--- a/dist-std/cm-data/99-perso.sh.addon
+++ b/dist-std/cm-data/99-perso.sh.addon
@@ -18,7 +18,11 @@ else
   S=$SYSTEM
   SYS=$SYSTEM
   # PRODUCT AND SYSTEM_EXT defined from recovery
-  # get_output_path is no-op function defined from recovery
+
+  get_output_path() {
+    # In recovery we mounted all partitions in the right place, so we can rely on symlinks
+    echo "$1"
+  }
 fi
 
 # path is needed when running from recovery (at install)
diff --git a/dist-std/cm.sh b/dist-std/cm.sh
index 77a4413..a4f4356 100755
--- a/dist-std/cm.sh
+++ b/dist-std/cm.sh
@@ -30,6 +30,8 @@ chmod 755 ${SYSTEM}/addon.d/99-perso.sh
 
 # call restore script post to remove bloat
 export SYSTEM
+export PRODUCT
+export SYSTEM_EXT
 ${SYSTEM}/addon.d/99-perso.sh post-restore
 
 echo "Done"