From 51747f261e7b6927be8c3ea2887a0adee062a603 Mon Sep 17 00:00:00 2001
From: KOWX712 <leecc0503@gmail.com>
Date: Sun, 19 Jan 2025 14:41:10 +0800
Subject: [PATCH] complete additional system app

complete aa7147d115b62e9bcad0635abbb35f5f75b1c625 (#10)
---
 module/service.sh               | 16 +++++++++++-----
 module/webui/scripts/applist.js |  4 ++--
 module/webui/scripts/main.js    |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/module/service.sh b/module/service.sh
index 83c392a..cc61cff 100644
--- a/module/service.sh
+++ b/module/service.sh
@@ -21,7 +21,7 @@ fi
 
 # Hide module
 if [ -f "$MODPATH/action.sh" ]; then
-    if [[ "$MODPATH" != "$HIDE_DIR" ]]; then
+    if [ "$MODPATH" != "$HIDE_DIR" ]; then
         rm -rf "$HIDE_DIR"
         mv "$MODPATH" "$HIDE_DIR"
     fi
@@ -32,8 +32,12 @@ fi
 rm -f "$MODPATH/module.prop"
 
 # Symlink tricky store
-[ -f "$MODPATH/action.sh" ] && ln -s "$MODPATH/action.sh" "$TS/action.sh"
-ln -s "$MODPATH/webui" "$TS/webroot"
+if [ -f "$MODPATH/action.sh" ] && [ ! -f "$TS/action.sh" ] && [ ! -L "$TS/action.sh" ]; then
+    ln -s "$MODPATH/action.sh" "$TS/action.sh"
+fi
+if [ ! -d "$TS/webroot" ] && [ ! -L "$TS/webroot" ]; then
+    ln -s "$MODPATH/webui" "$TS/webroot"
+fi
 
 # Optimization
 OUTPUT_APP="$MODPATH/common/tmp/applist"
@@ -46,7 +50,9 @@ done
 
 mkdir -p "$MODPATH/common/tmp"
 pm list packages -3 2>/dev/null | awk -F: '{print $2}' > "$OUTPUT_TMP"
-pm list package -3 | grep -q com.google.android.gms || { pm path com.google.android.gms >/dev/null 2>&1 && echo "com.google.android.gms" >> "$OUTPUT_TMP"; }
+
+SYSTEM_APP="com.google.android.gms|com.google.android.gsf|com.android.vending"
+pm list package -s | awk -F: '{print $2}' | grep -Ex "$SYSTEM_APP" >> "$OUTPUT_TMP"
 
 echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_APP"
 echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_SKIP"
@@ -63,4 +69,4 @@ cat "$OUTPUT_TMP" | while read -r PACKAGE; do
     fi
 done
 
-rm -f "$OUTPUT_TMP"
\ No newline at end of file
+rm -f "$OUTPUT_TMP"
diff --git a/module/webui/scripts/applist.js b/module/webui/scripts/applist.js
index 2d8b2f0..13efa0a 100644
--- a/module/webui/scripts/applist.js
+++ b/module/webui/scripts/applist.js
@@ -38,11 +38,11 @@ export async function fetchAppList() {
             console.warn("Applist file not found or could not be loaded. Skipping applist lookup.");
         }
 
-        const result = await execCommand('pm list packages -3; pm path com.google.android.gms; pm path com.google.android.gsf; pm path com.android.vending >/dev/null 2>&1 && echo "package:com.google.android.gms" && echo "package:com.google.android.gsf" && echo "package:com.android.vending" || true');
+        const result = await execCommand("pm list packages -3 | awk -F: '{print $2}'; pm list packages -s | awk -F: '{print $2}' | grep -Ex 'com.google.android.gms|com.google.android.gsf|com.android.vending'");
         const appEntries = result
             .split("\n")
             .map(line => {
-                const packageName = line.replace("package:", "").trim();
+                const packageName = line.trim();
                 const appName = applistMap[packageName] || null;
                 return { appName, packageName };
             })
diff --git a/module/webui/scripts/main.js b/module/webui/scripts/main.js
index ff899d5..b153ad8 100644
--- a/module/webui/scripts/main.js
+++ b/module/webui/scripts/main.js
@@ -18,7 +18,7 @@ export const floatingBtn = document.querySelector('.floating-btn');
 export const basePath = "set-path";
 export const appsWithExclamation = [];
 export const appsWithQuestion = [];
-const ADDITIONAL_APPS = [ "com.google.android.gms", "com.android.vending", "com.google.android.gsf", "io.github.vvb2060.keyattestation", "io.github.vvb2060.mahoshojo", "icu.nullptr.nativetest" ];
+const ADDITIONAL_APPS = [ "com.google.android.gms", "io.github.vvb2060.keyattestation", "io.github.vvb2060.mahoshojo", "icu.nullptr.nativetest" ]; // Always keep default apps in target.txt
 const rippleClasses = ['.language-option', '.menu-button', '.menu-options li', '.search-card', '.card', '.update-card', '.link-icon', '.floating-btn', '.uninstall-container', '.boot-hash-save-button', '.boot-hash-value', '.reboot', '.install'];
 
 // Variables