From 9164bf22c2e5d1e3dc9a81261bd5bbafc88e37fe Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Tue, 23 Feb 2021 23:56:58 -0800 Subject: [PATCH] Update terminology --- build.py | 8 ++++---- docs/details.md | 4 ++-- docs/faq.md | 8 ++++---- docs/guides.md | 10 +++++----- docs/install.md | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.py b/build.py index 6031244de..772b55274 100755 --- a/build.py +++ b/build.py @@ -345,12 +345,12 @@ def build_apk(args, module): def build_app(args): - header('* Building Magisk Manager') + header('* Building the Magisk app') build_apk(args, 'app') def build_stub(args): - header('* Building Magisk Manager stub') + header('* Building stub APK') build_apk(args, 'stub') @@ -462,11 +462,11 @@ binary_parser.add_argument( or empty for defaults ({', '.join(default_targets)})") binary_parser.set_defaults(func=build_binary) -app_parser = subparsers.add_parser('app', help='build Magisk Manager') +app_parser = subparsers.add_parser('app', help='build the Magisk app') app_parser.set_defaults(func=build_app) stub_parser = subparsers.add_parser( - 'stub', help='build stub Magisk Manager') + 'stub', help='build stub APK') stub_parser.set_defaults(func=build_stub) # Need to bind mount snet sources on top of stub folder diff --git a/docs/details.md b/docs/details.md index a8b4e55df..8d8af7db5 100644 --- a/docs/details.md +++ b/docs/details.md @@ -70,7 +70,7 @@ $SECURE_DIR/modules # Magisk modules that are pending for upgrade # Module files are not safe to be modified when mounted -# Modules installed in Magisk Manager will be stored here +# Modules installed through the Magisk app will be stored here # and will be merged into $SECURE_DIR/modules in the next reboot $SECURE_DIR/modules_update @@ -79,7 +79,7 @@ MAGISKDB=$SECURE_DIR/magisk.db # All magisk related binaries, including busybox, # scripts, and magisk binaries. Used in supporting -# module installation, addon.d, Magisk Manager etc. +# module installation, addon.d, the Magisk app etc. DATABIN=$SECURE_DIR/magisk ``` diff --git a/docs/faq.md b/docs/faq.md index 50dbeef6f..870d32887 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -8,10 +8,10 @@ Manually enable MagiskHide in settings (MagiskHide is no longer enabled by defau If you have USB debugging enabled in developer options, connect your phone to the PC. If your device is detected (check by `adb devices`), enter ADB shell and run the command `magisk --remove-modules`. This will remove all your modules and automatically reboot the device. -If unfortunately you do not have USB debugging enabled, reboot into Safe Mode. Most modern Android devices support pressing a special key combo at boot to enter Safe Mode as an emergency option. Magisk will detect Safe Mode being activated, and all modules will be disabled. Then reboot back to normal mode (the module disable state persists) and manage your modules through Magisk Manager. +If unfortunately you do not have USB debugging enabled, reboot into Safe Mode. Most modern Android devices support pressing a special key combo at boot to enter Safe Mode as an emergency option. Magisk will detect Safe Mode being activated, and all modules will be disabled. Then reboot back to normal mode (the module disable state persists) and manage your modules through the Magisk app. -### Q: After I hidden Magisk Manager, the app icon is broken. +### Q: After I hidden the Magisk app, the app icon is broken. -On devices running Android 9.0+, Magisk Manager will use a more advanced hiding method. It will install a "stub" APK that has nothing in it. The only functionality the stub app has is downloading the full Magisk Manager APK into its internal storage and dynamically load it. Due to the fact that the APK is literally *empty*, it does not contain the image resource for the app icon. +The Magisk app uses a more advanced hiding method that will install a "stub" APK that has nothing in it. The only functionality this stub app has is downloading the full the Magisk app APK into its internal storage and dynamically load it. Due to the fact that the APK is literally *empty*, it does not contain the image resource for the app icon. -When you open the hidden Magisk Manager, it will offer you the option to create a shortcut in the homescreen (which has both the correct app name and icon) for your convenience. You can also manually ask the app to create the icon in Magisk Manager settings. +When you open the hidden the Magisk app, it will offer you the option to create a shortcut in the homescreen (which has both the correct app name and icon) for your convenience. You can also manually ask the app to create the icon in app settings. diff --git a/docs/guides.md b/docs/guides.md index 9330a178f..387b3a221 100644 --- a/docs/guides.md +++ b/docs/guides.md @@ -10,7 +10,7 @@ For those who want to use this "Standalone Mode" feature outside of Magisk, ther 1. Set environment variable `ASH_STANDALONE` to `1`
Example: `ASH_STANDALONE=1 /data/adb/magisk/busybox sh