jcarr
/
gemini-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow command -v to fail (#212)

This commit is contained in:
Olcan 2025-04-29 10:21:09 -07:00 committed by GitHub
parent 28518aee0a
commit 4cb7386ec6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/cli/src/gemini.ts
View File

@ -25,12 +25,11 @@ const __dirname = dirname(__filename);
// node.js equivalent of scripts/sandbox_command.sh // node.js equivalent of scripts/sandbox_command.sh
function sandbox_command(): string { function sandbox_command(): string {
const sandbox = process.env.GEMINI_CODE_SANDBOX?.toLowerCase().trim() ?? ''; const sandbox = process.env.GEMINI_CODE_SANDBOX?.toLowerCase().trim() ?? '';
const opts: object = { stdio: 'ignore' };
if (['1', 'true'].includes(sandbox)) { if (['1', 'true'].includes(sandbox)) {
// look for docker or podman, in that order // look for docker or podman, in that order
if (execSync('command -v docker').toString().trim()) { if (execSync('command -v docker || true').toString().trim()) {
return 'docker'; // Set sandbox to 'docker' if found return 'docker'; // Set sandbox to 'docker' if found
} else if (execSync('command -v podman').toString().trim()) { } else if (execSync('command -v podman || true').toString().trim()) {
return 'podman'; // Set sandbox to 'podman' if found return 'podman'; // Set sandbox to 'podman' if found
} else { } else {
console.error( console.error(
@ -41,7 +40,7 @@ function sandbox_command(): string {
} }
} else if (sandbox) { } else if (sandbox) {
// confirm that specfied command exists // confirm that specfied command exists
if (execSync(`command -v ${sandbox}`).toString().trim()) { if (execSync(`command -v ${sandbox} || true`).toString().trim()) {
return sandbox; return sandbox;
} else { } else {
console.error( console.error(