ToothFairyAI_Public/tf_code
1
0
Fork 0
mirror of https://gitea.toothfairyai.com/ToothFairyAI/tf_code.git synced 2026-03-29 21:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: include cache bin directory in which() lookups (#18320)

Browse Source
This commit is contained in:
Dax 2026-03-19 21:21:55 -04:00 committed by GitHub
parent 52a7a04ad8
commit 6fcc970def
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/opencode/src/global/index.ts
View File

@ -18,7 +18,7 @@ export namespace Global {
return process.env.OPENCODE_TEST_HOME || os.homedir() return process.env.OPENCODE_TEST_HOME || os.homedir()
}, },
data, data,
bin: path.join(data, "bin"), bin: path.join(cache, "bin"),
log: path.join(data, "log"), log: path.join(data, "log"),
cache, cache,
config, config,

6
packages/opencode/src/util/which.ts
View File

@ -1,9 +1,13 @@
import whichPkg from "which" import whichPkg from "which"
import path from "path"
import { Global } from "../global"
export function which(cmd: string, env?: NodeJS.ProcessEnv) { export function which(cmd: string, env?: NodeJS.ProcessEnv) {
const base = env?.PATH ?? env?.Path ?? process.env.PATH ?? process.env.Path ?? ""
const full = base ? base + path.delimiter + Global.Path.bin : Global.Path.bin
const result = whichPkg.sync(cmd, { const result = whichPkg.sync(cmd, {
nothrow: true, nothrow: true,
path: env?.PATH ?? env?.Path ?? process.env.PATH ?? process.env.Path, path: full,
pathExt: env?.PATHEXT ?? env?.PathExt ?? process.env.PATHEXT ?? process.env.PathExt, pathExt: env?.PATHEXT ?? env?.PathExt ?? process.env.PATHEXT ?? process.env.PathExt,
}) })
return typeof result === "string" ? result : null return typeof result === "string" ? result : null