Fix bootloop when upgrading from older Magisk

build.py

@@ -106,7 +106,7 @@ def build_binary(args):
 	header('* Building binaries: ' + ' '.join(targets))
 
 	# Force update logging.h timestamp to trigger recompilation for the flags to make a difference
-
+	os.utime(os.path.join('native', 'jni', 'include', 'logging.h'))
 
 	# Basic flags
 	base_flags = 'MAGISK_VERSION=\"{}\" MAGISK_VER_CODE={} MAGISK_DEBUG={}'.format(config['version'], config['versionCode'],

native/jni/core/bootstages.c

@@ -585,7 +585,7 @@ void startup() {
 	close(root);
 
 	// Alternative binaries paths
-	char *alt_bin[] = { "/cache/data_bin", "/data/magisk",
+	char *alt_bin[] = { "/cache/data_bin", "/data/.magisk",
 						"/data/data/com.topjohnwu.magisk/install",
 						"/data/user_de/0/com.topjohnwu.magisk/install", NULL };
 	char *bin_path = NULL;
@@ -602,6 +602,7 @@ void startup() {
 	}
 
 	// Remove legacy stuffs
+	rm_rf("/data/magisk");
 	unlink("/data/magisk.img");
 	unlink("/data/magisk_debug.log");
 

scripts/addon.d.sh

@@ -27,7 +27,7 @@ initialize() {
   . $MAGISKBIN/util_functions.sh
 
   APK=/data/adb/magisk.apk
-  [ -f $APK ] || APK=/data/magisk/magisk.apk
+  [ -f $APK ] || APK=/data/.magisk/magisk.apk
   [ -f $APK ] || APK=/data/app/com.topjohnwu.magisk*/*.apk
 }
 

scripts/flash_script.sh

@@ -79,7 +79,7 @@ ui_print "- Constructing environment"
 check_data
 
 if $DATA; then
-  MAGISKBIN=/data/magisk
+  MAGISKBIN=/data/.magisk
   $DATA_DE && MAGISKBIN=/data/adb/magisk
   run_migrations
 else