highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-07-12 16:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move ollama executable out of bin dir (#6535)

Browse Source
This commit is contained in:
Daniel Hiltgen
2024-08-27 16:19:00 -07:00
committed by GitHub
parent d13c3daa0b
commit 93ea9240ae
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
envconfig/config.go
View File

@ -190,7 +190,7 @@ func RunnersDir() (p string) {
}
var paths []string
for _, root := range []string{filepath.Dir(exe), filepath.Join(filepath.Dir(exe), ".."), cwd} {
for _, root := range []string{filepath.Dir(exe), filepath.Join(filepath.Dir(exe), LibRelativeToExe()), cwd} {
paths = append(paths,
root,
filepath.Join(root, runtime.GOOS+"-"+runtime.GOARCH),
@ -282,3 +282,12 @@ func Values() map[string]string {
func Var(key string) string {
return strings.Trim(strings.TrimSpace(os.Getenv(key)), "\"'")
}
// On windows, we keep the binary at the top directory, but
// other platforms use a "bin" directory, so this returns ".."
func LibRelativeToExe() string {
if runtime.GOOS == "windows" {
return "."
}
return ".."
}