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
984997e7
Commit
984997e7
authored
Jan 11, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update paths
Close #2244
parent
b39f4075
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
13 deletions
+6
-13
Const.kt
app/src/main/java/com/topjohnwu/magisk/Const.kt
+3
-3
utils.sh
app/src/main/res/raw/utils.sh
+3
-10
No files found.
app/src/main/java/com/topjohnwu/magisk/Const.kt
View file @
984997e7
...
...
@@ -6,7 +6,7 @@ import java.io.File
object
Const
{
// Paths
const
val
MAGISK_PATH
=
"/sbin/.magisk/
img
"
const
val
MAGISK_PATH
=
"/sbin/.magisk/
modules
"
var
MAGISK_DISABLE_FILE
=
File
(
"xxx"
)
const
val
TMP_FOLDER_PATH
=
"/dev/tmp"
const
val
MAGISK_LOG
=
"/cache/magisk.log"
...
...
@@ -23,8 +23,8 @@ object Const {
val
USER_ID
=
Process
.
myUid
()
/
100000
object
Version
{
const
val
MIN_VERSION
=
"v1
8
.0"
const
val
MIN_VERCODE
=
1
8
000
const
val
MIN_VERSION
=
"v1
9
.0"
const
val
MIN_VERCODE
=
1
9
000
const
val
CONNECT_MODE
=
20100
const
val
PROVIDER_CONNECT
=
20102
}
...
...
app/src/main/res/raw/utils.sh
View file @
984997e7
...
...
@@ -89,8 +89,8 @@ EOF
add_hosts_module
()
{
# Do not touch existing hosts module
[
-d
/sbin/.magisk/
img
/hosts
]
&&
return
cd
/sbin/.magisk/
img
[
-d
/sbin/.magisk/
modules
/hosts
]
&&
return
cd
/sbin/.magisk/
modules
mkdir
-p
hosts/system/etc
cat
<<
EOF
> hosts/module.prop
id=hosts
...
...
@@ -99,17 +99,10 @@ version=1.0
versionCode=1
author=Magisk Manager
description=Magisk Manager built-in systemless hosts module
minMagisk=17000
EOF
if
[
-f
.core/hosts
]
;
then
# Migrate old hosts file to new module
mv
-f
.core/hosts hosts/system/etc/hosts
else
cp
-f
/system/etc/hosts hosts/system/etc/hosts
fi
magisk
--clone-attr
/system/etc/hosts hosts/system/etc/hosts
touch
hosts/update
touch
hosts/auto_mount
cd
/
}
...
...
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