mirror of
https://github.com/topjohnwu/Magisk
synced 2024-11-13 20:54:12 +01:00
Stop use clashing names
This commit is contained in:
parent
cd6918e6eb
commit
169c0fe4af
@ -605,7 +605,7 @@ void startup() {
|
||||
close(root);
|
||||
|
||||
// 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/user_de/0/com.topjohnwu.magisk/install", NULL };
|
||||
char *bin_path = NULL;
|
||||
|
@ -27,7 +27,7 @@ initialize() {
|
||||
. $MAGISKBIN/util_functions.sh
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
|
@ -75,7 +75,7 @@ ui_print "- Constructing environment"
|
||||
check_data
|
||||
|
||||
if $DATA; then
|
||||
MAGISKBIN=/data/.magisk
|
||||
MAGISKBIN=/data/magisk
|
||||
$DATA_DE && MAGISKBIN=/data/adb/magisk
|
||||
run_migrations
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user