removing icon and electron-builder

app/forge.config.ts

@@ -20,7 +20,12 @@ const config: ForgeConfig = {
     appVersion: process.env.VERSION || packageJson.version,
     asar: true,
     icon: './images/icon',
-    extraResource: ['../ollama', ...(process.platform === 'darwin' ? ['../ggml-metal.metal'] : [])],
+    extraResource: [
+      '../ollama',
+      './images/ollama_icon_dark_16x16.png',
+      './images/ollama_icon_bright_16x16.png',
+      ...(process.platform === 'darwin' ? ['../ggml-metal.metal'] : []),
+    ],
     ...(process.env.SIGN
       ? {
           osxSign: {
@@ -36,7 +41,7 @@ const config: ForgeConfig = {
       : {}),
   },
   rebuildConfig: {},
-  makers: [new MakerSquirrel({}), new MakerZIP({}, ['darwin']), new MakerRpm({}), new MakerDeb({})],
+  makers: [new MakerSquirrel({}), new MakerZIP({}, ['darwin'])],
   publishers: [
     new PublisherGithub({
       repository: {

app/package.json

@@ -8,7 +8,6 @@
     "start": "electron-forge start",
     "package": "electron-forge package",
     "package:sign": "SIGN=1 electron-forge package",
-    "dist": "electron-builder",
     "make": "electron-forge make",
     "make:sign": "SIGN=1 electron-forge make",
     "publish": "SIGN=1 electron-forge publish",
@@ -20,17 +19,6 @@
     "email": "jmorganca@gmail.com"
   },
   "license": "MIT",
-  "build" : {
-    "appId": "com.ollama.app",
-    "mac": {
-      "category": "public.app-category.productivity",
-      "target": [
-        "dmg",
-        "zip"
-      ],
-      "icon": "icon.icns"
-    }
-  },
   "devDependencies": {
     "@babel/core": "^7.22.5",
     "@babel/preset-react": "^7.22.5",

app/src/index.ts

@@ -7,8 +7,13 @@ require('@electron/remote/main').initialize()
 
 let tray: Tray | null = null
 const createSystemtray = () => {
-  const brightModeIconPath = path.join(__dirname, '..', '..', 'src', 'ollama_icon_dark_16x16.png')
+  let brightModeIconPath = path.join(__dirname, '..', '..', 'assets', 'ollama_icon_dark_16x16.png')
-  const darkModeIconPath = path.join(__dirname, '..', '..', 'src', 'ollama_icon_bright_16x16.png')
+  let darkModeIconPath = path.join(__dirname, '..', '..', 'assets', 'ollama_icon_bright_16x16.png')
+
+  if (app.isPackaged) {
+    brightModeIconPath = path.join(process.resourcesPath, 'ollama_icon_dark_16x16@2x.png')
+    darkModeIconPath = path.join(process.resourcesPath, 'ollama_icon_bright_16x16@2x.png')
+  }
 
   tray = new Tray(brightModeIconPath)