Commit 0a4e7eea authored by osm0sis's avatar osm0sis Committed by John Wu

scripts: clean up remaining Manager references

parent e3801d69
...@@ -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
......
################################## ##################################
# 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
......
...@@ -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_manager_apk find_magisk_apk
install_magisk install_magisk
# Cleanups # Cleanups
......
...@@ -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.
# #
......
...@@ -538,7 +538,7 @@ check_data() { ...@@ -538,7 +538,7 @@ check_data() {
resolve_vars resolve_vars
} }
find_manager_apk() { find_magisk_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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment