From 3356d7b6ff596c0ea2c308dedfc5b2e2c8023255 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 24 Feb 2019 04:45:47 -0500
Subject: [PATCH] More friendly to obscure/outdated custom recoveries

Close #1049
---
 native/jni/core/bootstages.cpp | 6 ++----
 scripts/util_functions.sh      | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/native/jni/core/bootstages.cpp b/native/jni/core/bootstages.cpp
index fbd5fba05..ca9db8eb9 100644
--- a/native/jni/core/bootstages.cpp
+++ b/native/jni/core/bootstages.cpp
@@ -79,9 +79,6 @@ private:
 	int get_path(char *path);
 };
 
-//char node_entry::buf[] = {};
-//char node_entry::buf2[] = {};
-
 node_entry::node_entry(const char *name, uint8_t status, uint8_t type)
 		: name(name), type(type), status(status), parent(nullptr) {}
 
@@ -358,7 +355,8 @@ static bool magisk_env() {
 		}
 	}
 
-	// Remove legacy stuffs
+	// Remove stuffs
+	rm_rf("/cache/data_adb");
 	unlink("/data/magisk.img");
 	unlink("/data/magisk_debug.log");
 
diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh
index b84ceebd6..be71322af 100644
--- a/scripts/util_functions.sh
+++ b/scripts/util_functions.sh
@@ -177,6 +177,7 @@ mount_partitions() {
   [ -z $SLOT ] || ui_print "- Current boot slot: $SLOT"
 
   ui_print "- Mounting /system, /vendor"
+  mkdir /system 2>/dev/null
   [ -f /system/build.prop ] || is_mounted /system || mount -o ro /system 2>/dev/null
   if ! is_mounted /system && ! [ -f /system/build.prop ]; then
     SYSTEMBLOCK=`find_block system$SLOT`
@@ -191,7 +192,7 @@ mount_partitions() {
     mount -o bind /system_root/system /system
   fi
   if [ -L /system/vendor ]; then
-    # Seperate /vendor partition
+    mkdir /vendor 2>/dev/null
     is_mounted /vendor || mount -o ro /vendor 2>/dev/null
     if ! is_mounted /vendor; then
       VENDORBLOCK=`find_block vendor$SLOT`