Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
879e996c
Commit
879e996c
authored
Jul 06, 2023
by
Jeffrey Morgan
Browse files
update app to use go binary
parent
9fe01867
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
Makefile
Makefile
+1
-1
app/forge.config.ts
app/forge.config.ts
+1
-1
app/package.json
app/package.json
+1
-1
app/src/index.ts
app/src/index.ts
+2
-2
No files found.
Makefile
View file @
879e996c
...
@@ -11,7 +11,7 @@ ollama: llama
...
@@ -11,7 +11,7 @@ ollama: llama
.PHONY
:
app
.PHONY
:
app
app
:
ollama
app
:
ollama
npm run
--prefix
app
packag
e
npm run
--prefix
app
mak
e
clean
:
clean
:
go clean
go clean
...
...
app/forge.config.ts
View file @
879e996c
...
@@ -14,7 +14,7 @@ const config: ForgeConfig = {
...
@@ -14,7 +14,7 @@ const config: ForgeConfig = {
packagerConfig
:
{
packagerConfig
:
{
asar
:
true
,
asar
:
true
,
icon
:
'
./images/icon
'
,
icon
:
'
./images/icon
'
,
extraResource
:
[
'
../
dist/
ollama
'
],
extraResource
:
[
'
../ollama
'
],
...(
process
.
env
.
SIGN
...(
process
.
env
.
SIGN
?
{
?
{
osxSign
:
{
osxSign
:
{
...
...
app/package.json
View file @
879e996c
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
"package"
:
"electron-forge package"
,
"package"
:
"electron-forge package"
,
"package:sign"
:
"SIGN=1 electron-forge package"
,
"package:sign"
:
"SIGN=1 electron-forge package"
,
"make"
:
"electron-forge make"
,
"make"
:
"electron-forge make"
,
"make:sign"
:
"SIGN=1 electron-forge
packag
e"
,
"make:sign"
:
"SIGN=1 electron-forge
mak
e"
,
"publish"
:
"SIGN=1 electron-forge publish"
,
"publish"
:
"SIGN=1 electron-forge publish"
,
"lint"
:
"eslint --ext .ts,.tsx ."
"lint"
:
"eslint --ext .ts,.tsx ."
},
},
...
...
app/src/index.ts
View file @
879e996c
...
@@ -43,9 +43,9 @@ if (app.isPackaged) {
...
@@ -43,9 +43,9 @@ if (app.isPackaged) {
console
.
log
(
resources
)
console
.
log
(
resources
)
// Start the executable
// Start the executable
const
exec
=
path
.
join
(
resources
,
'
ollama
'
,
'
ollama
'
)
const
exec
=
path
.
join
(
resources
,
'
ollama
'
)
console
.
log
(
`Starting
${
exec
}
`
)
console
.
log
(
`Starting
${
exec
}
`
)
const
proc
=
spawn
(
exec
,
[
'
serve
'
,
'
--port
'
,
'
7734
'
])
const
proc
=
spawn
(
exec
,
[
'
serve
'
])
proc
.
stdout
.
on
(
'
data
'
,
data
=>
{
proc
.
stdout
.
on
(
'
data
'
,
data
=>
{
console
.
log
(
`server:
${
data
}
`
)
console
.
log
(
`server:
${
data
}
`
)
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment