Move all /data files into /data/adb

scripts/addon.d.sh

@@ -12,7 +12,7 @@
 
 main() {
   # Magisk binaries
-  MAGISKBIN=/data/magisk
+  MAGISKBIN=/data/adb/magisk
   # This script always runs in recovery
   BOOTMODE=false
 
@@ -56,14 +56,14 @@ main() {
 
   if [ -f stock_boot* ]; then
     rm -f /data/stock_boot* 2>/dev/null
-    is_mounted /data && mv stock_boot* /data
+    mv stock_boot* /data
   fi
 
   patch_dtbo_image
 
   if [ -f stock_dtbo* ]; then
     rm -f /data/stock_dtbo* 2>/dev/null
-    is_mounted /data && mv stock_dtbo* /data
+    mv stock_dtbo* /data
   fi
 
   cd /

scripts/flash_script.sh

@@ -77,10 +77,17 @@ chmod -R 755 $CHROMEDIR $BINDIR
 
 ui_print "- Constructing environment"
 
-is_mounted /data && MAGISKBIN=/data/magisk || MAGISKBIN=/cache/data_bin
+if is_mounted /data; then
+  MAGISKBIN=/data/adb/magisk
+  mkdir -p /data/adb 2>/dev/null
+  chmod 700 /data/adb 2>/dev/null
 
-# Save our stock boot image dump before removing it
-mv /data/magisk/stock_boot* /data 2>/dev/null
+  # Some legacy migration
+  mv /data/magisk/stock_boot* /data 2>/dev/null
+  mv /data/magisk.img /data/adb/magisk.img
+else
+  MAGISKBIN=/cache/data_bin
+fi
 
 # Copy required files
 rm -rf $MAGISKBIN/* 2>/dev/null

scripts/magisk_uninstaller.sh

@@ -23,7 +23,7 @@
 
 [ -z $BOOTMODE ] && BOOTMODE=false
 
-MAGISKBIN=/data/magisk
+[ -d /data/adb/magisk ] && MAGISKBIN=/data/adb/magisk || MAGISKBIN=/data/magisk
 CHROMEDIR=$MAGISKBIN/chromeos
 
 if [ ! -f $MAGISKBIN/magiskboot -o ! -f $MAGISKBIN/util_functions.sh ]; then

scripts/uninstaller_loader.sh

@@ -54,8 +54,6 @@ BINDIR=$INSTALLER/$ARCH
 # Detection all done, start installing
 ##########################################################################################
 
-MAGISKBIN=/data/magisk
-
 if is_mounted /data; then
   recovery_actions
   # Save our stock boot image dump before removing it

scripts/util_functions.sh

@@ -11,7 +11,7 @@ MAGISK_VERSION_STUB
 SCRIPT_VERSION=$MAGISK_VER_CODE
 
 # Default location, will override if needed
-MAGISKBIN=/data/magisk
+MAGISKBIN=/data/adb/magisk
 
 BOOTSIGNER="/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp \$APK com.topjohnwu.magisk.utils.BootSigner"
 BOOTSIGNED=false