Skip to content

fix(ripgrep): use non-scoped temp directory to prevent premature cleanup (#23411) #23412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kagura-agent wants to merge 1 commit into from
Closed

fix(ripgrep): use non-scoped temp directory to prevent premature cleanup (#23411) #23412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions packages/opencode/src/file/ripgrep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | ChildPro
}, Effect.scoped)

const extract = Effect.fnUntraced(function* (archive: string, config: (typeof PLATFORM)[keyof typeof PLATFORM]) {
const dir = yield* fs.makeTempDirectoryScoped({ directory: Global.Path.bin, prefix: "ripgrep-" })
const dir = yield* fs.makeTempDirectory({ directory: Global.Path.bin, prefix: "ripgrep-" })

if (config.extension === "zip") {
const shell = (yield* Effect.sync(() => which("powershell.exe") ?? which("pwsh.exe"))) ?? "powershell.exe"
Expand All @@ -260,19 +260,21 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | ChildPro
dir,
])
if (result.code !== 0) {
yield* fs.remove(dir, { force: true, recursive: true }).pipe(Effect.ignore)
return yield* Effect.fail(error(result.stderr || result.stdout, result.code))
}
}

if (config.extension === "tar.gz") {
const result = yield* run("tar", ["-xzf", archive, "-C", dir])
if (result.code !== 0) {
yield* fs.remove(dir, { force: true, recursive: true }).pipe(Effect.ignore)
return yield* Effect.fail(error(result.stderr || result.stdout, result.code))
}
}

return path.join(dir, `ripgrep-${VERSION}-${config.platform}`, process.platform === "win32" ? "rg.exe" : "rg")
}, Effect.scoped)
return { executable: path.join(dir, `ripgrep-${VERSION}-${config.platform}`, process.platform === "win32" ? "rg.exe" : "rg"), tempDir: dir }
})

const filepath = yield* Effect.cached(
Effect.gen(function* () {
Expand Down Expand Up @@ -305,13 +307,15 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | ChildPro
}

yield* fs.writeWithDirs(archive, new Uint8Array(bytes)).pipe(Effect.orDie)
const extracted = yield* extract(archive, config)
const { executable: extracted, tempDir } = yield* extract(archive, config)
const exists = yield* fs.exists(extracted).pipe(Effect.orDie)
if (!exists) {
yield* fs.remove(tempDir, { force: true, recursive: true }).pipe(Effect.ignore)
return yield* Effect.fail(new Error(`ripgrep archive did not contain executable: ${extracted}`))
}

yield* fs.copyFile(extracted, target).pipe(Effect.orDie)
yield* fs.remove(tempDir, { force: true, recursive: true }).pipe(Effect.ignore)
if (process.platform !== "win32") {
yield* fs.chmod(target, 0o755).pipe(Effect.orDie)
}
Expand Down
Loading