From b668378e23e85423c2fcf0f3d239946b794720d6 Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Mon, 31 Mar 2025 15:52:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E5=91=BD=E4=BB=A4=E4=BB=A5=E8=8E=B7?= =?UTF-8?q?=E5=8F=96KPM=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/shirkneko/zako/sukisu/ui/util/KsuCli.kt | 4 ++-- .../zako/sukisu/ui/viewmodel/KpmViewModel.kt | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/util/KsuCli.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/util/KsuCli.kt index fe873201..cf4c4c01 100644 --- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/util/KsuCli.kt +++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/util/KsuCli.kt @@ -528,9 +528,9 @@ fun controlKpmModule(name: String, args: String? = null): String { return result } -fun printKpmModules(): String { +fun getKpmVersion(): String { val shell = getRootShell() - val cmd = "${getKpmmgrPath()} print" + val cmd = "${getKpmmgrPath()} version" val result = ShellUtils.fastCmd(shell, cmd) return result } diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/viewmodel/KpmViewModel.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/viewmodel/KpmViewModel.kt index 9f430cfd..803c3222 100644 --- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/viewmodel/KpmViewModel.kt +++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/viewmodel/KpmViewModel.kt @@ -50,21 +50,16 @@ class KpmViewModel : ViewModel() { val modules = parseModuleList(moduleInfo) moduleList = modules + + // 获取 KPM 版本信息 + val kpmVersion = getKpmVersion() + Log.d("KsuCli", "KPM Version: $kpmVersion") } finally { isRefreshing = false } } } - private fun getInstalledKernelPatches(): List { - return try { - val output = printKpmModules() - parseModuleList(output) - } catch (e: Exception) { - emptyList() - } - } - private fun parseModuleList(output: String): List { return output.split("\n").mapNotNull { line -> if (line.isBlank()) return@mapNotNull null