From 5d75d837efc9315c19f538f2b2130baf5fbc242a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 30 Jan 2025 12:21:38 -0800 Subject: [PATCH] discover: fix default LibOllamaPath value (#8702) --- discover/path.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/discover/path.go b/discover/path.go index a9a6518df..b6b648dbf 100644 --- a/discover/path.go +++ b/discover/path.go @@ -24,12 +24,14 @@ var LibOllamaPath string = func() string { return "" } - libPath := filepath.Dir(exe) + var libPath string switch runtime.GOOS { case "windows": libPath = filepath.Join(filepath.Dir(exe), "lib", "ollama") case "linux": libPath = filepath.Join(filepath.Dir(exe), "..", "lib", "ollama") + case "darwin": + libPath = filepath.Dir(exe) } cwd, err := os.Getwd() @@ -37,17 +39,19 @@ var LibOllamaPath string = func() string { return "" } - // build paths for development - buildPaths := []string{ + paths := []string{ + libPath, + + // build paths for development filepath.Join(filepath.Dir(exe), "build", "lib", "ollama"), filepath.Join(cwd, "build", "lib", "ollama"), } - for _, p := range buildPaths { + for _, p := range paths { if _, err := os.Stat(p); err == nil { return p } } - return libPath + return filepath.Dir(exe) }()