From ad4f7dfc95a664d2c20d2fbf21916170761b817d Mon Sep 17 00:00:00 2001
From: Didgeridoohan <Didgeridoohan@users.noreply.github.com>
Date: Tue, 4 Sep 2018 10:00:53 +0200
Subject: [PATCH] v2.4.1-v29

---
 META-INF/com/google/android/update-binary | 30 +++++++++++------------
 README.md                                 |  3 +++
 module.prop                               |  6 ++---
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index 8e627ab..739478e 100755
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -6,13 +6,10 @@
 #
 ##########################################################################################
 
-# Detect whether in boot mode
-ps | grep zygote | grep -v grep >/dev/null && BOOTMODE=true || BOOTMODE=false
-$BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMODE=true
-
 TMPDIR=/dev/tmp
 INSTALLER=$TMPDIR/install
-MAGISKBIN=/data/adb/magisk
+# Always mount under tmp
+MOUNTPATH=$TMPDIR/magisk_img
 
 # Default permissions
 umask 022
@@ -26,7 +23,7 @@ ui_print() { echo "$1"; }
 
 require_new_magisk() {
   ui_print "*******************************"
-  ui_print " Please install Magisk v15.0+! "
+  ui_print " Please install Magisk v17.0+! "
   ui_print "*******************************"
   exit 1
 }
@@ -40,18 +37,21 @@ ZIP=$3
 
 mount /data 2>/dev/null
 
-# Utility functions must exist
-[ -f $MAGISKBIN/util_functions.sh ] || require_new_magisk
-# Load utility fuctions
-. $MAGISKBIN/util_functions.sh
+# Load utility functions
+if [ -f /data/adb/magisk/util_functions.sh ]; then
+  . /data/adb/magisk/util_functions.sh
+elif [ -f /data/magisk/util_functions.sh ]; then
+  NVBASE=/data
+  . /data/magisk/util_functions.sh
+else
+  require_new_magisk
+fi
 
-# We can't alter magisk image live, use alternative image if required
-$BOOTMODE && IMG=/data/adb/magisk_merge.img
-# Always mount under tmp
-MOUNTPATH=$TMPDIR/magisk_img
+# Use alternative image if in BOOTMODE
+$BOOTMODE && IMG=$NVBASE/magisk_merge.img
 
 # Preperation for flashable zips
-get_outfd
+setup_flashable
 
 # Mount partitions
 mount_partitions
diff --git a/README.md b/README.md
index 59f3e48..e339af6 100644
--- a/README.md
+++ b/README.md
@@ -199,6 +199,9 @@ If you can't run the `props` script for some reason, the logs are also stored in
 
 
 ## Changelog
+### v2.4.1  
+- Updated to Magisk module template v17000. Compatible with Magisk v17+ only.
+
 ### v2.4.0  
 - Added a check for if the download of the internal Busybox fails.
 - Added an option for picking what boot stage a custom prop should be set in.
diff --git a/module.prop b/module.prop
index 835218a..d081b26 100644
--- a/module.prop
+++ b/module.prop
@@ -1,7 +1,7 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v2.4.0-v29
-versionCode=23
+version=v2.4.1-v29
+versionCode=24
 author=Didgeridoohan
 description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Edit prop files for better root hiding. Set/reset prop values set by MagiskHide. Change any prop values easily.
-minMagisk=1500
+minMagisk=17000