From 0a4e7eea41f6170e64ff55ae674343107a4ef923 Mon Sep 17 00:00:00 2001 From: osm0sis Date: Sun, 21 Mar 2021 19:25:56 -0300 Subject: [PATCH] scripts: clean up remaining Manager references --- .../java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt | 2 +- app/src/main/res/raw/manager.sh | 6 +++--- scripts/addon.d.sh | 2 +- scripts/emulator.sh | 4 ++-- scripts/util_functions.sh | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt index 98708c64b..06ef1c55c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt @@ -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 diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh index 08881d74f..0aa513d5a 100644 --- a/app/src/main/res/raw/manager.sh +++ b/app/src/main/res/raw/manager.sh @@ -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 diff --git a/scripts/addon.d.sh b/scripts/addon.d.sh index 3a95d400a..88604e2a9 100644 --- a/scripts/addon.d.sh +++ b/scripts/addon.d.sh @@ -109,7 +109,7 @@ main() { ui_print "- Target image: $BOOTIMAGE" remove_system_su - find_manager_apk + find_magisk_apk install_magisk # Cleanups diff --git a/scripts/emulator.sh b/scripts/emulator.sh index af894491b..374346547 100755 --- a/scripts/emulator.sh +++ b/scripts/emulator.sh @@ -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. # diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh index 4d195c154..34abf0c84 100644 --- a/scripts/util_functions.sh +++ b/scripts/util_functions.sh @@ -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