From e6bd5f2c40816911b2949404317bedba60aaa31d Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Tue, 30 Apr 2019 10:37:18 -0300
Subject: [PATCH] Display error if actual Magisk addon.d script cannot be run -
 this would likely occur on an FDE device with block map OTAs (a la LineageOS)
 since they do not require/request decrypt - for reference all other addon.d
 "v1" cases should work fine:   1) FDE with openrecovery script works fine
 since it requests decrypt   2) FBE with openrecovery script OR block map work
 fine since /data/adb remains accessible

---
 scripts/flash_script.sh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/scripts/flash_script.sh b/scripts/flash_script.sh
index df14ef3bf..67ef8735f 100644
--- a/scripts/flash_script.sh
+++ b/scripts/flash_script.sh
@@ -80,9 +80,23 @@ if [ -d /system/addon.d ]; then
   ui_print "- Adding addon.d survival script"
   mount -o rw,remount /system
   ADDOND=/system/addon.d/99-magisk.sh
-  echo '#!/sbin/sh' > $ADDOND
-  echo '# ADDOND_VERSION=2' >> $ADDOND
-  echo 'exec sh /data/adb/magisk/addon.d.sh "$@"' >> $ADDOND
+  cat <<EOF > $ADDOND
+#!/sbin/sh
+# ADDOND_VERSION=2
+
+if [ -f /data/adb/magisk/addon.d.sh ]; then
+  exec sh /data/adb/magisk/addon.d.sh "\$@"
+else
+  OUTFD=\$(ps | grep -oE 'update(.*)' | grep -v 'grep' | cut -d" " -f3)
+  ui_print() { echo -e "ui_print \$1\nui_print" >> /proc/self/fd/\$OUTFD; }
+
+  ui_print "************************"
+  ui_print "* Magisk addon.d failed"
+  ui_print "************************"
+  ui_print "! Cannot find Magisk binaries - was data wiped or not decrypted?"
+  ui_print "! Reflash OTA from decrypted recovery or reflash Magisk"
+fi
+EOF
   chmod 755 $ADDOND
 fi