From b1851ff71888abb928f70f824ea778980865532d Mon Sep 17 00:00:00 2001 From: KOWX712 Date: Thu, 1 May 2025 16:32:57 +0800 Subject: [PATCH] fix: system app basename with split apk issue --- module/service.sh | 4 +--- module/webui/scripts/applist.js | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/module/service.sh b/module/service.sh index 3717c69..6a6802a 100644 --- a/module/service.sh +++ b/module/service.sh @@ -112,9 +112,7 @@ echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT pm list packages -s | grep -E "$SYSTEM_APP" 2>/dev/null || true } | awk -F: '{print $2}' | while read -r PACKAGE; do # Get APK path for the package - APK_PATH=$(pm path "$PACKAGE" 2>/dev/null | grep "base.apk" | awk -F: '{print $2}') - [ -z "$APK_PATH" ] && APK_PATH=$(pm path "$PACKAGE" 2>/dev/null | grep ".apk" | awk -F: '{print $2}') - + APK_PATH=$(pm path "$PACKAGE" 2>/dev/null | head -n1 | awk -F: '{print $2}') APP_NAME=$(aapt dump badging "$APK_PATH" 2>/dev/null | grep "application-label:" | sed "s/application-label://g; s/'//g") [ -z "$APP_NAME" ] && APP_NAME="$PACKAGE" echo " {\"app_name\": \"$APP_NAME\", \"package_name\": \"$PACKAGE\"}," >> "$OUTPUT_APP" diff --git a/module/webui/scripts/applist.js b/module/webui/scripts/applist.js index 2ee1564..3b2d84b 100644 --- a/module/webui/scripts/applist.js +++ b/module/webui/scripts/applist.js @@ -43,8 +43,7 @@ export async function fetchAppList() { }; } const appName = await execCommand(` - base_apk=$(pm path ${packageName} | grep "base.apk" | awk -F: '{print $2}') - [ -n "$base_apk" ] || base_apk=$(pm path ${packageName} | grep ".apk" | awk -F: '{print $2}') + base_apk=$(pm path ${packageName} | head -n1 | awk -F: '{print $2}') ${basePath}/common/aapt dump badging $base_apk 2>/dev/null | grep "application-label:" | sed "s/application-label://; s/'//g" `); return {