From a7679db6e99f971306bc4b27c603e93bc67ac254 Mon Sep 17 00:00:00 2001 From: Olcan Date: Fri, 2 May 2025 08:15:46 -0700 Subject: sandbox setting and argument (#243) --- packages/cli/src/utils/sandbox.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'packages/cli/src/utils/sandbox.ts') diff --git a/packages/cli/src/utils/sandbox.ts b/packages/cli/src/utils/sandbox.ts index ceaf8726..40fca09c 100644 --- a/packages/cli/src/utils/sandbox.ts +++ b/packages/cli/src/utils/sandbox.ts @@ -15,9 +15,13 @@ import { } from '../config/settings.js'; // node.js equivalent of scripts/sandbox_command.sh -export function sandbox_command(): string { - const sandbox = process.env.GEMINI_CODE_SANDBOX?.toLowerCase().trim() ?? ''; - if (['1', 'true'].includes(sandbox)) { +export function sandbox_command(sandbox?: string | boolean): string { + // note environment variable takes precedence over argument (from command line or settings) + sandbox = process.env.GEMINI_CODE_SANDBOX?.toLowerCase().trim() ?? sandbox; + if (sandbox === '1' || sandbox === 'true') sandbox = true; + else if (sandbox === '0' || sandbox === 'false') sandbox = false; + + if (sandbox === true) { // look for docker or podman, in that order if (execSync('command -v docker || true').toString().trim()) { return 'docker'; // Set sandbox to 'docker' if found -- cgit v1.2.3