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
f520fe36
Commit
f520fe36
authored
Nov 22, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to use new paths
parent
7273a1c3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+1
-4
Const.java
app/src/main/java/com/topjohnwu/magisk/utils/Const.java
+11
-2
Shell.java
app/src/main/java/com/topjohnwu/magisk/utils/Shell.java
+2
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
f520fe36
...
...
@@ -130,10 +130,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
.
setPositiveButton
(
R
.
string
.
ok
,
(
d
,
i
)
->
{
prefs
.
edit
().
putString
(
Const
.
Key
.
CUSTOM_CHANNEL
,
url
.
getText
().
toString
()).
apply
();
})
.
setNegativeButton
(
R
.
string
.
close
,
(
d
,
i
)
->
{
mm
.
updateChannel
=
Const
.
Value
.
STABLE_CHANNEL
;
prefs
.
edit
().
putString
(
Const
.
Key
.
UPDATE_CHANNEL
,
String
.
valueOf
(
Const
.
Value
.
STABLE_CHANNEL
)).
apply
();
})
.
setNegativeButton
(
R
.
string
.
close
,
null
)
.
show
();
}
return
true
;
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Const.java
View file @
f520fe36
...
...
@@ -24,11 +24,20 @@ public class Const {
public
static
final
String
MAGISK_DISABLE_FILE
=
"/cache/.disable_magisk"
;
public
static
final
String
TMP_FOLDER_PATH
=
"/dev/tmp"
;
public
static
final
String
MAGISK_LOG
=
"/cache/magisk.log"
;
public
static
final
String
BUSYBOX_PATH
=
"/dev/magisk/bin"
;
public
static
final
File
EXTERNAL_PATH
=
new
File
(
Environment
.
getExternalStorageDirectory
(),
"MagiskManager"
);
public
static
String
BUSYBOX_PATH
()
{
if
(
Utils
.
itemExist
(
"/sbin/.core/busybox/busybox"
))
{
return
"/sbin/.core/busybox"
;
}
else
{
return
"/dev/magisk/bin"
;
}
}
public
static
String
MAGISK_PATH
()
{
if
(
Utils
.
itemExist
(
"/dev/magisk/img"
))
{
if
(
Utils
.
itemExist
(
"/sbin/.core/img"
))
{
return
"/sbin/.core/img"
;
}
else
if
(
Utils
.
itemExist
(
"/dev/magisk/img"
))
{
return
"/dev/magisk/img"
;
}
else
{
return
"/magisk"
;
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Shell.java
View file @
f520fe36
...
...
@@ -89,8 +89,9 @@ public class Shell {
}
// Root shell initialization
String
bbpath
=
Const
.
BUSYBOX_PATH
();
mm
.
shell
.
run_raw
(
false
,
false
,
"export PATH="
+
Const
.
BUSYBOX_PATH
+
":$PATH"
,
"export PATH="
+
bbpath
+
":$PATH"
,
"mount_partitions"
,
"find_boot_image"
,
"migrate_boot_backup"
);
...
...
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