From d8bb3af06b999f6fbf8d4251e9ddecd3b5fbf63b Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 29 Dec 2017 04:25:30 +0800 Subject: [PATCH] Miscellaneous --- app | 2 +- scripts/util_functions.sh | 4 ++-- snet/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app b/app index de2285d5e..1adf33126 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit de2285d5e920ad020f5f2348264b67dc34e0882d +Subproject commit 1adf331268476405f22725518335ef49f6999fd9 diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh index 94ffe60c7..60ac9ada9 100644 --- a/scripts/util_functions.sh +++ b/scripts/util_functions.sh @@ -12,7 +12,7 @@ SCRIPT_VERSION=$MAGISK_VER_CODE # Default location, will override if needed MAGISKBIN=/data/adb/magisk -[ -z $MAGISKBIN ] && MOUNTPATH=/sbin/.core/img +[ -z $MOUNTPATH ] && MOUNTPATH=/sbin/.core/img [ -z $IMG ] && IMG=/data/adb/magisk.img BOOTSIGNER="/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp \$APK com.topjohnwu.magisk.utils.BootSigner" @@ -86,7 +86,7 @@ getvar() { local VARNAME=$1 local VALUE=$(eval echo \$$VARNAME) [ ! -z $VALUE ] && return - for DIR in /.backup /data /cache /system; do + for DIR in /.backup /dev /data /cache /system; do VALUE=`grep_prop $VARNAME $DIR/.magisk` [ ! -z $VALUE ] && break; done diff --git a/snet/build.gradle b/snet/build.gradle index 9824d1d94..b93107f57 100644 --- a/snet/build.gradle +++ b/snet/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 - buildToolsVersion "27.0.2" + buildToolsVersion "27.0.3" defaultConfig { applicationId "com.topjohnwu.snet"