Update terminology
This commit is contained in:
topjohnwu
parent
911a576893
commit
9164bf22c2
8
build.py
8
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
```
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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`<br>Example: `ASH_STANDALONE=1 /data/adb/magisk/busybox sh <script>`
|
||||
2. Toggle with command-line options:<br>`/data/adb/magisk/busybox sh -o standalone <script>`
|
||||
|
||||
To make sure all subsequent `sh` shell executed also runs in standalone mode, option 1 is the preferred method (and this is what Magisk and Magisk Manager internally use) as environment variables are inherited down to child processes.
|
||||
To make sure all subsequent `sh` shell executed also runs in standalone mode, option 1 is the preferred method (and this is what Magisk and the Magisk app internally use) as environment variables are inherited down to child processes.
|
||||
|
||||
|
||||
## Magisk Modules
|
||||
|
|
@ -104,7 +104,7 @@ All files you want Magisk to replace/inject for you should be placed in this fol
|
|||
|
||||
## Magisk Module Installer
|
||||
|
||||
A Magisk Module Installer is a Magisk Module packaged in a zip file that can be flashed in Magisk Manager or custom recoveries such as TWRP. An installer has the same file structure as a Magisk module (please check the previous section for more info). The simplest Magisk Module Installer is just a Magisk Module packed in a zip file, with addition to the following files:
|
||||
A Magisk Module Installer is a Magisk Module packaged in a zip file that can be flashed in the Magisk app or custom recoveries such as TWRP. An installer has the same file structure as a Magisk module (please check the previous section for more info). The simplest Magisk Module Installer is just a Magisk Module packed in a zip file, with addition to the following files:
|
||||
|
||||
- `update-binary`: Download the latest [module_installer.sh](https://github.com/topjohnwu/Magisk/blob/master/scripts/module_installer.sh) and rename/copy that script as `update-binary`
|
||||
- `updater-script`: This file should only contain the string `#MAGISK`
|
||||
|
|
@ -141,7 +141,7 @@ This script will run in Magisk's BusyBox `ash` shell with "Standalone Mode" enab
|
|||
##### Variables
|
||||
- `MAGISK_VER` (string): the version string of current installed Magisk (e.g. `v20.0`)
|
||||
- `MAGISK_VER_CODE` (int): the version code of current installed Magisk (e.g. `20000`)
|
||||
- `BOOTMODE` (bool): `true` if the module is being installed in Magisk Manager
|
||||
- `BOOTMODE` (bool): `true` if the module is being installed in the Magisk app
|
||||
- `MODPATH` (path): the path where your module files should be installed
|
||||
- `TMPDIR` (path): a place where you can temporarily store files
|
||||
- `ZIPFILE` (path): your module's installation zip
|
||||
|
|
@ -188,13 +188,13 @@ The list above will result in the following files being created: `$MODPATH/syste
|
|||
|
||||
#### Notes
|
||||
|
||||
- When your module is downloaded with Magisk Manager, `update-binary` will be **forcefully** replaced with the latest [`module_installer.sh`](https://github.com/topjohnwu/Magisk/blob/master/scripts/module_installer.sh) to ensure all installer uses up-to-date scripts. **DO NOT** try to add any custom logic in `update-binary` as it is pointless.
|
||||
- When your module is downloaded with the Magisk app, `update-binary` will be **forcefully** replaced with the latest [`module_installer.sh`](https://github.com/topjohnwu/Magisk/blob/master/scripts/module_installer.sh) to ensure all installer uses up-to-date scripts. **DO NOT** try to add any custom logic in `update-binary` as it is pointless.
|
||||
- Due to historical reasons, **DO NOT** add a file named `install.sh` in your module installer. That specific file was previously used and will be treated differently.
|
||||
- **DO NOT** call `exit` at the end of `customize.sh`. The module installer would want to do finalizations.
|
||||
|
||||
## Submit Modules
|
||||
|
||||
You can submit a module to **Magisk-Module-Repo** so users can download your module directly in Magisk Manager.
|
||||
You can submit a module to **Magisk-Module-Repo** so users can download your module directly in the Magisk app.
|
||||
|
||||
- Follow the instructions in the previous section to create a valid installer for your module.
|
||||
- Create `README.md` (filename should be exactly the same) containing all info for your module. If you are not familiar with the Markdown syntax, the [Markdown Cheat Sheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) will be handy.
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ If you insist on using custom recoveries, rename the Magisk APK to `uninstall.zi
|
|||
|
||||
If your device does not have ramdisk in boot images, Magisk has no choice but to be installed in the recovery partition. For these devices, you will have to **reboot to recovery** every time you want Magisk.
|
||||
|
||||
When Magisk is installed in your recovery, **you CANNOT use custom recoveries to install/upgrade Magisk!** The only way to install/upgrade Magisk is through Magisk Manager. The app will be aware of your device state and install to the correct partition and reboot into the correct mode.
|
||||
When Magisk is installed in your recovery, **you CANNOT use custom recoveries to install/upgrade Magisk!** The only way to install/upgrade Magisk is through the Magisk app. It will be aware of your device state and install to the correct partition and reboot into the correct mode.
|
||||
|
||||
Since Magisk now hijacks the recovery of the device, there is a mechanism to let you *actually* boot into recovery mode when needed: it is determined by **how long you press the recovery key combo**.
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ If you think the bootloader is fully unlocked, it is actually not! Samsung intro
|
|||
- Press the **Install** button in the Magisk card
|
||||
- If your device does **NOT** have boot ramdisk, make sure **"Recovery Mode"** is checked in options.<br>In most cases it should already be automatically checked.
|
||||
- Choose **"Select and Patch a File"** in method, and select the `AP` tar file
|
||||
- Magisk Manager will patch the whole firmware file to `[Internal Storage]/Download/magisk_patched_[random_strings].tar`
|
||||
- The Magisk app will patch the whole firmware file to `[Internal Storage]/Download/magisk_patched_[random_strings].tar`
|
||||
- Copy the patched tar file to your PC with ADB:<br>
|
||||
`adb pull /sdcard/Download/magisk_patched_[random_strings].tar`<br>
|
||||
**DO NOT USE MTP** as it is known to corrupt large files.
|
||||
|
|
@ -125,7 +125,7 @@ If you are stuck in a bootloop, agree to do a factory reset if promted.
|
|||
### Additional Notes
|
||||
|
||||
- **Never, ever** try to restore either `boot` or `recovery` partitions back to stock! You can easily brick your device by doing so, and the only way out is to do a full Odin restore with data wipe.
|
||||
- To upgrade your device with a new firmware, **NEVER** directly use the stock `AP` tar file with reasons mentioned above. **Always** pre-patch `AP` in Magisk Manager before flashing in Odin.
|
||||
- To upgrade your device with a new firmware, **NEVER** directly use the stock `AP` tar file with reasons mentioned above. **Always** pre-patch `AP` in the Magisk app before flashing in Odin.
|
||||
- Use `HOME_CSC` to preserve your data when doing a firmware upgrade in the future. Using `CSC` is only necessary for the initial Magisk installation.
|
||||
- Never just flash only `AP`, or else Odin can shrink your `/data` filesystem. Flash full `AP` + `BL` + `CP` + `HOME_CSC` when upgrading.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue