Commit 169c0fe4 authored by topjohnwu's avatar topjohnwu

Stop use clashing names

parent cd6918e6
...@@ -605,7 +605,7 @@ void startup() { ...@@ -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;
......
...@@ -27,7 +27,7 @@ initialize() { ...@@ -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
} }
......
...@@ -75,7 +75,7 @@ ui_print "- Constructing environment" ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment