From 169c0fe4af468e5503a3799c3eb36a6d340e1cc9 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 3 Aug 2018 03:43:02 +0800 Subject: [PATCH] Stop use clashing names --- native/jni/core/bootstages.c | 2 +- scripts/addon.d.sh | 2 +- scripts/flash_script.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/native/jni/core/bootstages.c b/native/jni/core/bootstages.c index 95a59d630..f4d2663cd 100644 --- a/native/jni/core/bootstages.c +++ b/native/jni/core/bootstages.c @@ -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; diff --git a/scripts/addon.d.sh b/scripts/addon.d.sh index f63b2d191..dad3f448d 100644 --- a/scripts/addon.d.sh +++ b/scripts/addon.d.sh @@ -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 } diff --git a/scripts/flash_script.sh b/scripts/flash_script.sh index 005a8ce5f..62362e92c 100644 --- a/scripts/flash_script.sh +++ b/scripts/flash_script.sh @@ -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