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
0a4e7eea
Commit
0a4e7eea
authored
Mar 21, 2021
by
osm0sis
Committed by
John Wu
Mar 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scripts: clean up remaining Manager references
parent
e3801d69
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
SettingsItems.kt
...in/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+1
-1
manager.sh
app/src/main/res/raw/manager.sh
+3
-3
addon.d.sh
scripts/addon.d.sh
+1
-1
emulator.sh
scripts/emulator.sh
+2
-2
util_functions.sh
scripts/util_functions.sh
+3
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View file @
0a4e7eea
...
@@ -87,7 +87,7 @@ object Hide : BaseSettingsItem.Input() {
...
@@ -87,7 +87,7 @@ object Hide : BaseSettingsItem.Input() {
get
()
=
if
(
isError
)
null
else
result
get
()
=
if
(
isError
)
null
else
result
@get
:
Bindable
@get
:
Bindable
var
result
=
"
Manager
"
var
result
=
"
Settings
"
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
result
,
BR
.
error
)
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
result
,
BR
.
error
)
val
maxLength
val
maxLength
...
...
app/src/main/res/raw/manager.sh
View file @
0a4e7eea
##################################
##################################
# Magisk
Manager
internal scripts
# Magisk
app
internal scripts
##################################
##################################
run_delay
()
{
run_delay
()
{
...
@@ -115,8 +115,8 @@ id=hosts
...
@@ -115,8 +115,8 @@ id=hosts
name=Systemless Hosts
name=Systemless Hosts
version=1.0
version=1.0
versionCode=1
versionCode=1
author=Magisk
Manager
author=Magisk
description=Magisk
Manager
built-in systemless hosts module
description=Magisk
app
built-in systemless hosts module
EOF
EOF
magisk
--clone
/system/etc/hosts hosts/system/etc/hosts
magisk
--clone
/system/etc/hosts hosts/system/etc/hosts
touch
hosts/update
touch
hosts/update
...
...
scripts/addon.d.sh
View file @
0a4e7eea
...
@@ -109,7 +109,7 @@ main() {
...
@@ -109,7 +109,7 @@ main() {
ui_print
"- Target image:
$BOOTIMAGE
"
ui_print
"- Target image:
$BOOTIMAGE
"
remove_system_su
remove_system_su
find_ma
nager
_apk
find_ma
gisk
_apk
install_magisk
install_magisk
# Cleanups
# Cleanups
...
...
scripts/emulator.sh
View file @
0a4e7eea
...
@@ -4,10 +4,10 @@
...
@@ -4,10 +4,10 @@
#####################################################################
#####################################################################
#
#
# This script will setup an environment with minimal Magisk that
# This script will setup an environment with minimal Magisk that
#
Magisk Manager
will be happy to run properly within the official
#
the Magisk app
will be happy to run properly within the official
# emulator bundled with Android Studio (AVD).
# emulator bundled with Android Studio (AVD).
#
#
# ONLY use this script for developing
Magisk Manager
or root apps
# ONLY use this script for developing
the Magisk app
or root apps
# in the emulator. The constructed Magisk environment is not a
# in the emulator. The constructed Magisk environment is not a
# fully functional one as if it is running on an actual device.
# fully functional one as if it is running on an actual device.
#
#
...
...
scripts/util_functions.sh
View file @
0a4e7eea
...
@@ -538,7 +538,7 @@ check_data() {
...
@@ -538,7 +538,7 @@ check_data() {
resolve_vars
resolve_vars
}
}
find_ma
nager
_apk
()
{
find_ma
gisk
_apk
()
{
local
DBAPK
local
DBAPK
[
-z
$APK
]
&&
APK
=
/data/adb/magisk.apk
[
-z
$APK
]
&&
APK
=
/data/adb/magisk.apk
[
-f
$APK
]
||
APK
=
/data/magisk/magisk.apk
[
-f
$APK
]
||
APK
=
/data/magisk/magisk.apk
...
@@ -549,7 +549,7 @@ find_manager_apk() {
...
@@ -549,7 +549,7 @@ find_manager_apk() {
[
-z
$DBAPK
]
||
APK
=
/data/user_de/
*
/
$DBAPK
/dyn/
*
.apk
[
-z
$DBAPK
]
||
APK
=
/data/user_de/
*
/
$DBAPK
/dyn/
*
.apk
[
-f
$APK
]
||
[
-z
$DBAPK
]
||
APK
=
/data/app/
$DBAPK
*
/
*
.apk
[
-f
$APK
]
||
[
-z
$DBAPK
]
||
APK
=
/data/app/
$DBAPK
*
/
*
.apk
fi
fi
[
-f
$APK
]
||
ui_print
"! Unable to detect Magisk
Manager
APK for BootSigner"
[
-f
$APK
]
||
ui_print
"! Unable to detect Magisk
app
APK for BootSigner"
}
}
run_migrations
()
{
run_migrations
()
{
...
@@ -742,7 +742,7 @@ install_module() {
...
@@ -742,7 +742,7 @@ install_module() {
done
done
if
$BOOTMODE
;
then
if
$BOOTMODE
;
then
# Update info for Magisk
Manager
# Update info for Magisk
app
mktouch
$NVBASE
/modules/
$MODID
/update
mktouch
$NVBASE
/modules/
$MODID
/update
cp
-af
$MODPATH
/module.prop
$NVBASE
/modules/
$MODID
/module.prop
cp
-af
$MODPATH
/module.prop
$NVBASE
/modules/
$MODID
/module.prop
fi
fi
...
...
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