MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts: clean up remaining Manager references

Browse Source
This commit is contained in:
osm0sis 2021-03-21 19:25:56 -03:00 committed by John Wu
parent e3801d6965
commit 0a4e7eea41
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View File

@ -87,7 +87,7 @@ object Hide : BaseSettingsItem.Input() {
get() = if (isError) null else result
@get:Bindable
var result = "Manager"
var result = "Settings"
set(value) = set(value, field, { field = it }, BR.result, BR.error)
val maxLength

6
app/src/main/res/raw/manager.sh
View File

@ -1,5 +1,5 @@
##################################
# Magisk Manager internal scripts
# Magisk app internal scripts
##################################
run_delay() {
@ -115,8 +115,8 @@ id=hosts
name=Systemless Hosts
version=1.0
versionCode=1
author=Magisk Manager
description=Magisk Manager built-in systemless hosts module
author=Magisk
description=Magisk app built-in systemless hosts module
EOF
magisk --clone /system/etc/hosts hosts/system/etc/hosts
touch hosts/update

2
scripts/addon.d.sh
View File

@ -109,7 +109,7 @@ main() {
ui_print "- Target image: $BOOTIMAGE"
remove_system_su
find_manager_apk
find_magisk_apk
install_magisk
# Cleanups

4
scripts/emulator.sh
View File

@ -4,10 +4,10 @@
#####################################################################
#
# 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).
#
# 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
# fully functional one as if it is running on an actual device.
#

6
scripts/util_functions.sh
View File

@ -538,7 +538,7 @@ check_data() {
resolve_vars
}
find_manager_apk() {
find_magisk_apk() {
local DBAPK
[ -z $APK ] && APK=/data/adb/magisk.apk
[ -f $APK ] || APK=/data/magisk/magisk.apk
@ -549,7 +549,7 @@ find_manager_apk() {
[ -z $DBAPK ] || APK=/data/user_de/*/$DBAPK/dyn/*.apk
[ -f $APK ] || [ -z $DBAPK ] || APK=/data/app/$DBAPK*/*.apk
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() {
@ -742,7 +742,7 @@ install_module() {
done
if $BOOTMODE; then
# Update info for Magisk Manager
# Update info for Magisk app
mktouch $NVBASE/modules/$MODID/update
cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop
fi