diff --git a/electron/main/backend/update-center/index.ts b/electron/main/backend/update-center/index.ts index 9803daf8..ed710883 100644 --- a/electron/main/backend/update-center/index.ts +++ b/electron/main/backend/update-center/index.ts @@ -48,6 +48,14 @@ const DPKG_QUERY_INSTALLED_COMMAND = { ], }; +const getApmPrintUrisCommand = (pkgname: string) => ({ + command: "bash", + args: [ + "-lc", + `amber-pm-debug /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf download ${pkgname} --print-uris`, + ], +}); + const runCommandCapture: UpdateCenterCommandRunner = async ( command, args, @@ -93,11 +101,11 @@ const loadApmItemMetadata = async ( | { item: UpdateCenterItem; warning?: undefined } | { item: null; warning: string } > => { - const metadataResult = await runCommand("apm", [ - "info", - item.pkgname, - "--print-uris", - ]); + const printUrisCommand = getApmPrintUrisCommand(item.pkgname); + const metadataResult = await runCommand( + printUrisCommand.command, + printUrisCommand.args, + ); const commandError = getCommandError( `apm metadata query for ${item.pkgname}`, metadataResult, diff --git a/electron/main/backend/update-center/install.ts b/electron/main/backend/update-center/install.ts index 0f8f1424..3cdd0c2c 100644 --- a/electron/main/backend/update-center/install.ts +++ b/electron/main/backend/update-center/install.ts @@ -155,14 +155,14 @@ export const installUpdateItem = async ({ } if (item.source === "apm" && filePath) { - const auditCommand = buildPrivilegedCommand( + const installCommand = buildPrivilegedCommand( SHELL_CALLER_PATH, - ["apm", "ssaudit", filePath], + ["apm", "ssinstall", filePath], superUserCmd, ); await runCommand( - auditCommand.execCommand, - auditCommand.execParams, + installCommand.execCommand, + installCommand.execParams, onLog, signal, ); diff --git a/src/__tests__/unit/update-center/load-items.test.ts b/src/__tests__/unit/update-center/load-items.test.ts index ff7c34e3..adab1cc7 100644 --- a/src/__tests__/unit/update-center/load-items.test.ts +++ b/src/__tests__/unit/update-center/load-items.test.ts @@ -14,6 +14,9 @@ const APTSS_LIST_UPGRADABLE_KEY = const DPKG_QUERY_INSTALLED_KEY = "dpkg-query -W -f=${Package}\t${db:Status-Want} ${db:Status-Status} ${db:Status-Eflag}\n"; +const APM_PRINT_URIS_KEY = + "bash -lc amber-pm-debug /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf download spark-weather --print-uris"; + describe("update-center load items", () => { it("enriches apm and migration items with download metadata needed by the runner", async () => { const commandResults = new Map([ @@ -50,7 +53,7 @@ describe("update-center load items", () => { }, ], [ - "apm info spark-weather --print-uris", + APM_PRINT_URIS_KEY, { code: 0, stdout: diff --git a/src/__tests__/unit/update-center/task-runner.test.ts b/src/__tests__/unit/update-center/task-runner.test.ts index f2f39fed..eaf5831c 100644 --- a/src/__tests__/unit/update-center/task-runner.test.ts +++ b/src/__tests__/unit/update-center/task-runner.test.ts @@ -294,7 +294,7 @@ describe("update-center task runner", () => { args: [ "/opt/spark-store/extras/shell-caller.sh", "apm", - "ssaudit", + "ssinstall", "/tmp/spark-player.deb", ], },