浏览代码

update app to use go binary

Jeffrey Morgan 1 年之前
父节点
当前提交
879e996ca4
共有 4 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      Makefile
  2. 1 1
      app/forge.config.ts
  3. 1 1
      app/package.json
  4. 2 2
      app/src/index.ts

+ 1 - 1
Makefile

@@ -11,7 +11,7 @@ ollama: llama
 
 .PHONY: app
 app: ollama
-	npm run --prefix app package
+	npm run --prefix app make
 
 clean:
 	go clean

+ 1 - 1
app/forge.config.ts

@@ -14,7 +14,7 @@ const config: ForgeConfig = {
   packagerConfig: {
     asar: true,
     icon: './images/icon',
-    extraResource: ['../dist/ollama'],
+    extraResource: ['../ollama'],
     ...(process.env.SIGN
       ? {
           osxSign: {

+ 1 - 1
app/package.json

@@ -9,7 +9,7 @@
     "package": "electron-forge package",
     "package:sign": "SIGN=1 electron-forge package",
     "make": "electron-forge make",
-    "make:sign": "SIGN=1 electron-forge package",
+    "make:sign": "SIGN=1 electron-forge make",
     "publish": "SIGN=1 electron-forge publish",
     "lint": "eslint --ext .ts,.tsx ."
   },

+ 2 - 2
app/src/index.ts

@@ -43,9 +43,9 @@ if (app.isPackaged) {
   console.log(resources)
 
   // Start the executable
-  const exec = path.join(resources, 'ollama', 'ollama')
+  const exec = path.join(resources, 'ollama')
   console.log(`Starting ${exec}`)
-  const proc = spawn(exec, ['serve', '--port', '7734'])
+  const proc = spawn(exec, ['serve'])
   proc.stdout.on('data', data => {
     console.log(`server: ${data}`)
   })