From bba1cc933d12e0ece6eaddb952b4158b8494b814 Mon Sep 17 00:00:00 2001 From: Eva Ho Date: Thu, 6 Jul 2023 14:11:26 -0400 Subject: [PATCH] fix path for system tray --- app/{images => assets}/icon.icns | Bin app/{images => assets}/ollama_icon_birhgt_16x16.png | Bin .../ollama_icon_bright_16x16@2x.png | Bin app/{images => assets}/ollama_icon_dark_16x16.png | Bin .../ollama_icon_dark_16x16@2x.png | Bin app/forge.config.ts | 7 ++++--- 6 files changed, 4 insertions(+), 3 deletions(-) rename app/{images => assets}/icon.icns (100%) rename app/{images => assets}/ollama_icon_birhgt_16x16.png (100%) rename app/{images => assets}/ollama_icon_bright_16x16@2x.png (100%) rename app/{images => assets}/ollama_icon_dark_16x16.png (100%) rename app/{images => assets}/ollama_icon_dark_16x16@2x.png (100%) diff --git a/app/images/icon.icns b/app/assets/icon.icns similarity index 100% rename from app/images/icon.icns rename to app/assets/icon.icns diff --git a/app/images/ollama_icon_birhgt_16x16.png b/app/assets/ollama_icon_birhgt_16x16.png similarity index 100% rename from app/images/ollama_icon_birhgt_16x16.png rename to app/assets/ollama_icon_birhgt_16x16.png diff --git a/app/images/ollama_icon_bright_16x16@2x.png b/app/assets/ollama_icon_bright_16x16@2x.png similarity index 100% rename from app/images/ollama_icon_bright_16x16@2x.png rename to app/assets/ollama_icon_bright_16x16@2x.png diff --git a/app/images/ollama_icon_dark_16x16.png b/app/assets/ollama_icon_dark_16x16.png similarity index 100% rename from app/images/ollama_icon_dark_16x16.png rename to app/assets/ollama_icon_dark_16x16.png diff --git a/app/images/ollama_icon_dark_16x16@2x.png b/app/assets/ollama_icon_dark_16x16@2x.png similarity index 100% rename from app/images/ollama_icon_dark_16x16@2x.png rename to app/assets/ollama_icon_dark_16x16@2x.png diff --git a/app/forge.config.ts b/app/forge.config.ts index 3214ce1ad..df5a8643c 100644 --- a/app/forge.config.ts +++ b/app/forge.config.ts @@ -19,11 +19,12 @@ const config: ForgeConfig = { packagerConfig: { appVersion: process.env.VERSION || packageJson.version, asar: true, - icon: './images/icon', + icon: './assets/icon.icns', extraResource: [ '../ollama', - './images/ollama_icon_dark_16x16.png', - './images/ollama_icon_bright_16x16.png', + '../ggml-metal.metal', + path.join(__dirname, './assets/ollama_icon_dark_16x16@2x.png'), + path.join(__dirname, './assets/ollama_icon_bright_16x16@2x.png'), ...(process.platform === 'darwin' ? ['../ggml-metal.metal'] : []), ], ...(process.env.SIGN