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

Fix output in Magisk Manager if no root exists

Browse Source
This commit is contained in:
topjohnwu 2018-09-20 16:21:22 -04:00
parent 04bcd145d3
commit 3f87f6aee3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
View File

@ -50,7 +50,7 @@ public class RootUtils extends Shell.Initializer {
job.add(nonroot); job.add(nonroot);
} }
job.add("mount_partitions", "get_flags", "run_migrations").exec(); job.add("mount_partitions", "get_flags", "run_migrations", "export BOOTMODE=true").exec();
Data.keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY")); Data.keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY"));
Data.keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT")); Data.keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT"));

3
scripts/util_functions.sh
View File

@ -10,7 +10,8 @@
#MAGISK_VERSION_STUB #MAGISK_VERSION_STUB
# Detect whether in boot mode # Detect whether in boot mode
ps | grep zygote | grep -qv grep && BOOTMODE=true || BOOTMODE=false [ -z $BOOTMODE ] && BOOTMODE=false
$BOOTMODE || ps | grep zygote | grep -qv grep && BOOTMODE=true
$BOOTMODE || ps -A | grep zygote | grep -qv grep && BOOTMODE=true $BOOTMODE || ps -A | grep zygote | grep -qv grep && BOOTMODE=true
# Presets # Presets