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
c967e618
Commit
c967e618
authored
Aug 12, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjustment to direct install
parent
59f78d7d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
InstallMagisk.java
.../full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+1
-1
utils.sh
app/src/full/res/raw/utils.sh
+4
-4
No files found.
app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View file @
c967e618
...
@@ -278,7 +278,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
...
@@ -278,7 +278,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
break
;
break
;
case
SECOND_SLOT_MODE:
case
SECOND_SLOT_MODE:
case
DIRECT_MODE:
case
DIRECT_MODE:
if
(!
Shell
.
su
(
Utils
.
fmt
(
"direct_install %s %s
%s"
,
patched
,
mBoot
,
installDir
))
if
(!
Shell
.
su
(
Utils
.
fmt
(
"direct_install %s %s
"
,
installDir
,
mBoot
))
.
to
(
console
,
logs
).
exec
().
isSuccess
())
.
to
(
console
,
logs
).
exec
().
isSuccess
())
return
false
;
return
false
;
if
(!
Data
.
keepVerity
)
if
(!
Data
.
keepVerity
)
...
...
app/src/full/res/raw/utils.sh
View file @
c967e618
...
@@ -57,15 +57,15 @@ direct_install() {
...
@@ -57,15 +57,15 @@ direct_install() {
rm
-rf
/data/adb/magisk/
*
2>/dev/null
rm
-rf
/data/adb/magisk/
*
2>/dev/null
mkdir
-p
/data/adb/magisk 2>/dev/null
mkdir
-p
/data/adb/magisk 2>/dev/null
chmod
700 /data/adb
chmod
700 /data/adb
cp
-rf
$3
/
*
/data/adb/magisk
cp
-rf
$1
/
*
/data/adb/magisk
rm
-rf
/data/adb/magisk/new-boot.img
echo
"- Flashing new boot image"
echo
"- Flashing new boot image"
flash_image
$1
$2
flash_image
$1
/new-boot.img
$2
if
[
$?
-ne
0
]
;
then
if
[
$?
-ne
0
]
;
then
echo
"! Insufficient partition size"
echo
"! Insufficient partition size"
return
1
return
1
fi
fi
rm
-f
$1
rm
-rf
$1
rm
-rf
$3
return
0
return
0
}
}
...
...
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