Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
3f87f6ae
Commit
3f87f6ae
authored
Sep 20, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix output in Magisk Manager if no root exists
parent
04bcd145
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
RootUtils.java
app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
+1
-1
util_functions.sh
scripts/util_functions.sh
+2
-1
No files found.
app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
View file @
3f87f6ae
...
...
@@ -50,7 +50,7 @@ public class RootUtils extends Shell.Initializer {
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
.
keepEnc
=
Boolean
.
parseBoolean
(
ShellUtils
.
fastCmd
(
"echo $KEEPFORCEENCRYPT"
));
...
...
scripts/util_functions.sh
View file @
3f87f6ae
...
...
@@ -10,7 +10,8 @@
#MAGISK_VERSION_STUB
# 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
# Presets
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment