TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 20:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge app scripts

Browse Source
This commit is contained in:
topjohnwu 2020-02-10 03:36:28 -08:00
parent 022151fefd
commit 5fb071d80b
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,11 @@ class RootInit : Shell.Initializer() {
fun init(context: Context, shell: Shell): Boolean { fun init(context: Context, shell: Shell): Boolean {
val job = shell.newJob() val job = shell.newJob()
job.add(context.rawResource(R.raw.manager))
if (shell.isRoot) { if (shell.isRoot) {
job.add(context.rawResource(R.raw.util_functions)) 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") Const.MAGISK_DISABLE_FILE = SuFile("/cache/.disable_magisk")
} else {
job.add(context.rawResource(R.raw.nonroot_utils))
} }
job.add( job.add(

22
app/src/main/res/raw/utils.sh → app/src/main/res/raw/manager.sh
View File

@ -1,3 +1,7 @@
##################################
# Magisk Manager internal scripts
##################################
env_check() { env_check() {
for file in busybox magisk magiskboot magiskinit util_functions.sh boot_patch.sh; do for file in busybox magisk magiskboot magiskinit util_functions.sh boot_patch.sh; do
[ -f $MAGISKBIN/$file ] || return 1 [ -f $MAGISKBIN/$file ] || return 1
@ -116,4 +120,20 @@ force_pm_install() {
return $res 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; }

13
app/src/main/res/raw/nonroot_utils.sh
View File

@ -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; }