Unverified Commit 5d75d837 authored by Jeffrey Morgan's avatar Jeffrey Morgan Committed by GitHub
Browse files

discover: fix default LibOllamaPath value (#8702)

parent 711648c9
...@@ -24,12 +24,14 @@ var LibOllamaPath string = func() string { ...@@ -24,12 +24,14 @@ var LibOllamaPath string = func() string {
return "" return ""
} }
libPath := filepath.Dir(exe) var libPath string
switch runtime.GOOS { switch runtime.GOOS {
case "windows": case "windows":
libPath = filepath.Join(filepath.Dir(exe), "lib", "ollama") libPath = filepath.Join(filepath.Dir(exe), "lib", "ollama")
case "linux": case "linux":
libPath = filepath.Join(filepath.Dir(exe), "..", "lib", "ollama") libPath = filepath.Join(filepath.Dir(exe), "..", "lib", "ollama")
case "darwin":
libPath = filepath.Dir(exe)
} }
cwd, err := os.Getwd() cwd, err := os.Getwd()
...@@ -37,17 +39,19 @@ var LibOllamaPath string = func() string { ...@@ -37,17 +39,19 @@ var LibOllamaPath string = func() string {
return "" return ""
} }
// build paths for development paths := []string{
buildPaths := []string{ libPath,
// build paths for development
filepath.Join(filepath.Dir(exe), "build", "lib", "ollama"), filepath.Join(filepath.Dir(exe), "build", "lib", "ollama"),
filepath.Join(cwd, "build", "lib", "ollama"), filepath.Join(cwd, "build", "lib", "ollama"),
} }
for _, p := range buildPaths { for _, p := range paths {
if _, err := os.Stat(p); err == nil { if _, err := os.Stat(p); err == nil {
return p return p
} }
} }
return libPath return filepath.Dir(exe)
}() }()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment