Merge app scripts

app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt

@@ -16,12 +16,11 @@ class RootInit : Shell.Initializer() {
 
     fun init(context: Context, shell: Shell): Boolean {
         val job = shell.newJob()
+        job.add(context.rawResource(R.raw.manager))
         if (shell.isRoot) {
             job.add(context.rawResource(R.raw.util_functions))
-                .add(context.rawResource(R.raw.utils))
+                .add("SHA1=`grep_prop SHA1 /sbin/.magisk/config`")
             Const.MAGISK_DISABLE_FILE = SuFile("/cache/.disable_magisk")
-        } else {
-            job.add(context.rawResource(R.raw.nonroot_utils))
         }
 
         job.add(

app/src/main/res/raw/manager.sh

@@ -1,3 +1,7 @@
+##################################
+# Magisk Manager internal scripts
+##################################
+
 env_check() {
   for file in busybox magisk magiskboot magiskinit util_functions.sh boot_patch.sh; do
     [ -f $MAGISKBIN/$file ] || return 1
@@ -116,4 +120,20 @@ force_pm_install() {
   return $res
 }
 
-SHA1=`grep_prop SHA1 /sbin/.magisk/config`
+##########################
+# Non-root util_functions
+##########################
+
+mount_partitions() {
+  [ "`getprop ro.build.ab_update`" = "true" ] && SLOT=`getprop ro.boot.slot_suffix`
+  # Check whether non rootfs root dir exists
+  grep ' / ' /proc/mounts | grep -qv 'rootfs' && SYSTEM_ROOT=true || SYSTEM_ROOT=false
+}
+
+get_flags() {
+  $SYSTEM_ROOT && KEEPVERITY=true || KEEPVERITY=false
+  [ "`getprop ro.crypto.state`" = "encrypted" ] && KEEPFORCEENCRYPT=true || KEEPFORCEENCRYPT=false
+  RECOVERYMODE=false
+}
+
+run_migrations() { return; }

app/src/main/res/raw/nonroot_utils.sh

@@ -1,13 +0,0 @@
-mount_partitions() {
-  [ "`getprop ro.build.ab_update`" = "true" ] && SLOT=`getprop ro.boot.slot_suffix`
-  # Check whether non rootfs root dir exists
-  grep ' / ' /proc/mounts | grep -qv 'rootfs' && SYSTEM_ROOT=true || SYSTEM_ROOT=false
-}
-
-get_flags() {
-  $SYSTEM_ROOT && KEEPVERITY=true || KEEPVERITY=false
-  [ "`getprop ro.crypto.state`" = "encrypted" ] && KEEPFORCEENCRYPT=true || KEEPFORCEENCRYPT=false
-  RECOVERYMODE=false
-}
-
-run_migrations() { return; }