From fe4981da21a05e6261e395bc212adbf49b994b78 Mon Sep 17 00:00:00 2001 From: jenslody Date: Thu, 22 Apr 2021 12:55:15 +0200 Subject: [PATCH] Fix strings fallback in find_manager_apk There is no preceding character (at least on some devices). This regex should work in any cases, with and without preceding character. --- scripts/util_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh index 3f845bb22..00b026378 100644 --- a/scripts/util_functions.sh +++ b/scripts/util_functions.sh @@ -556,7 +556,7 @@ find_magisk_apk() { [ -f $APK ] || APK=/data/app/*/com.topjohnwu.magisk*/*.apk if [ ! -f $APK ]; then DBAPK=$(magisk --sqlite "SELECT value FROM strings WHERE key='requester'" 2>/dev/null | cut -d= -f2) - [ -z $DBAPK ] && DBAPK=$(strings /data/adb/magisk.db | grep -E '^.requester.' | cut -c11-) + [ -z $DBAPK ] && DBAPK=$(strings /data/adb/magisk.db | grep -oE 'requester..*' | cut -c10-) [ -z $DBAPK ] || APK=/data/user_de/*/$DBAPK/dyn/*.apk [ -f $APK ] || [ -z $DBAPK ] || APK=/data/app/$DBAPK*/*.apk [ -f $APK ] || [ -z $DBAPK ] || APK=/data/app/*/$DBAPK*/*.apk