diff --git a/electron-builder.json5 b/electron-builder.json5 index e5d00689..d323c4fa 100644 --- a/electron-builder.json5 +++ b/electron-builder.json5 @@ -12,7 +12,7 @@ "dist-electron" ], "linux": { - "icon": "public/amber-pm-logo.png", + "icon": "public/amber-pm-logo.icns", "category": "System", "executableName": "apm-app-store", "desktop": { diff --git a/electron/main/backend/install-manager.ts b/electron/main/backend/install-manager.ts index 4ae6e442..77a53f1f 100644 --- a/electron/main/backend/install-manager.ts +++ b/electron/main/backend/install-manager.ts @@ -37,11 +37,10 @@ const checkSuperUserCommand = async (): Promise => { return superUserCmd; } -const runCommandCapture = async (execCommand: string, execParams: string[], envOverride?: NodeJS.ProcessEnv) => { +const runCommandCapture = async (execCommand: string, execParams: string[]) => { return await new Promise<{ code: number; stdout: string; stderr: string }>((resolve) => { const child = spawn(execCommand, execParams, { shell: true, - env: { ...process.env, ...(envOverride || {}) } }); let stdout = ''; @@ -330,12 +329,9 @@ ipcMain.on('remove-installed', async (_event, pkgname: string) => { }); ipcMain.handle('list-upgradable', async () => { - const listCommand = 'source /opt/apm-store/transhell.sh; load_transhell_debug; amber-pm-debug aptss list --upgradable'; const { code, stdout, stderr } = await runCommandCapture( - '/bin/bash', - ['-lc', listCommand], - { LANGUAGE: 'en_US' } - ); + '/usr/bin/amber-pm-debug', + ['aptss', 'list', '--upgradable']); if (code !== 0) { logger.error(`list-upgradable failed: ${stderr || stdout}`); return { diff --git a/public/amber-pm-logo.icns b/public/amber-pm-logo.icns new file mode 100644 index 00000000..f5a12e75 Binary files /dev/null and b/public/amber-pm-logo.icns differ