TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-24 18:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop use clashing names

Browse Source
This commit is contained in:
topjohnwu 2018-08-03 03:43:02 +08:00
parent cd6918e6eb
commit 169c0fe4af
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/core/bootstages.c
View File

@ -605,7 +605,7 @@ void startup() {
close(root); close(root);
// Alternative binaries paths // Alternative binaries paths
char *alt_bin[] = { "/cache/data_bin", "/data/.magisk", char *alt_bin[] = { "/cache/data_bin", "/data/magisk",
"/data/data/com.topjohnwu.magisk/install", "/data/data/com.topjohnwu.magisk/install",
"/data/user_de/0/com.topjohnwu.magisk/install", NULL }; "/data/user_de/0/com.topjohnwu.magisk/install", NULL };
char *bin_path = NULL; char *bin_path = NULL;

2
scripts/addon.d.sh
View File

@ -27,7 +27,7 @@ initialize() {
. $MAGISKBIN/util_functions.sh . $MAGISKBIN/util_functions.sh
APK=/data/adb/magisk.apk APK=/data/adb/magisk.apk
[ -f $APK ] || APK=/data/.magisk/magisk.apk [ -f $APK ] || APK=/data/magisk/magisk.apk
[ -f $APK ] || APK=/data/app/com.topjohnwu.magisk*/*.apk [ -f $APK ] || APK=/data/app/com.topjohnwu.magisk*/*.apk
} }

2
scripts/flash_script.sh
View File

@ -75,7 +75,7 @@ ui_print "- Constructing environment"
check_data check_data
if $DATA; then if $DATA; then
MAGISKBIN=/data/.magisk MAGISKBIN=/data/magisk
$DATA_DE && MAGISKBIN=/data/adb/magisk $DATA_DE && MAGISKBIN=/data/adb/magisk
run_migrations run_migrations
else else