lkn
/
ollie
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ResolveTool to check OLLIE_TOOLS_PATH for variant cmd names

This commit is contained in:
Ollie Agent 2026-07-30 23:40:24 +02:00
parent 3d65d787a2
commit cb5f99b332
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
justfile
View File

@ -155,6 +155,8 @@ install-data:
install -m755 data/tools/route {{cfg}}/tools/route
install -m755 data/tools/subagent_generate {{cfg}}/tools/subagent_generate
install -m755 data/tools/subagent_spawn {{cfg}}/tools/subagent_spawn
install -m755 data/tools/system_logs_dmesg {{cfg}}/tools/system_logs_dmesg
install -m755 data/tools/system_logs_journald {{cfg}}/tools/system_logs_journald
# Tool metadata (.meta sidecar files)
for f in data/tools/*.meta; do install -m644 "$f" {{cfg}}/tools/"$(basename $f)"; done
# Tools (library modules)

5
toolsrv/meta.go
View File

@ -196,6 +196,11 @@ func ResolveTool(name string) (string, error) {
if m, err := LoadMetaFile(name); err == nil && m != nil {
resolved := m.Resolve()
if resolved != nil && resolved.Cmd != "" {
// Check tools path for the cmd name first
cmdLocal := filepath.Join(ToolsPath(), resolved.Cmd)
if info, err := os.Stat(cmdLocal); err == nil && !info.IsDir() {
return cmdLocal, nil
}
if filepath.IsAbs(resolved.Cmd) {
return resolved.Cmd, nil
}