From 97e08fc804a8272ff546436cc38d8a20165513cd Mon Sep 17 00:00:00 2001 From: Tommaso Sciortino Date: Tue, 10 Jun 2025 18:34:36 -0700 Subject: [PATCH] Remove warnings for old env var names. (#920) --- packages/cli/src/gemini.tsx | 25 +------------------------ scripts/sandbox_command.js | 7 ------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index 27547454..f0044780 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -9,8 +9,7 @@ import { render } from 'ink'; import { AppWrapper } from './ui/App.js'; import { loadCliConfig } from './config/config.js'; import { readStdin } from './utils/readStdin.js'; -import { fileURLToPath } from 'node:url'; -import { dirname, basename } from 'node:path'; +import { basename } from 'node:path'; import { sandbox_command, start_sandbox } from './utils/sandbox.js'; import { LoadedSettings, loadSettings } from './config/settings.js'; import { themeManager } from './ui/themes/theme-manager.js'; @@ -34,33 +33,11 @@ import { WriteFileTool, } from '@gemini-cli/core'; -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); - export async function main() { const workspaceRoot = process.cwd(); const settings = loadSettings(workspaceRoot); setWindowTitle(basename(workspaceRoot), settings); - // warn about deprecated environment variables - if (process.env.GEMINI_CODE_MODEL) { - console.warn('GEMINI_CODE_MODEL is deprecated. Use GEMINI_MODEL instead.'); - process.env.GEMINI_MODEL = process.env.GEMINI_CODE_MODEL; - } - if (process.env.GEMINI_CODE_SANDBOX) { - console.warn( - 'GEMINI_CODE_SANDBOX is deprecated. Use GEMINI_SANDBOX instead.', - ); - process.env.GEMINI_SANDBOX = process.env.GEMINI_CODE_SANDBOX; - } - if (process.env.GEMINI_CODE_SANDBOX_IMAGE) { - console.warn( - 'GEMINI_CODE_SANDBOX_IMAGE is deprecated. Use GEMINI_SANDBOX_IMAGE_NAME instead.', - ); - process.env.GEMINI_SANDBOX_IMAGE_NAME = - process.env.GEMINI_CODE_SANDBOX_IMAGE; // Corrected to GEMINI_SANDBOX_IMAGE_NAME - } - const geminiIgnorePatterns = loadGeminiIgnorePatterns(workspaceRoot); if (settings.errors.length > 0) { diff --git a/scripts/sandbox_command.js b/scripts/sandbox_command.js index d115f97f..a469c81a 100644 --- a/scripts/sandbox_command.js +++ b/scripts/sandbox_command.js @@ -63,13 +63,6 @@ if (!geminiSandbox) { geminiSandbox = process.env.GEMINI_SANDBOX; } -if (process.env.GEMINI_CODE_SANDBOX) { - console.warn( - 'WARNING: GEMINI_CODE_SANDBOX is deprecated. Use GEMINI_SANDBOX instead.', - ); - geminiSandbox = process.env.GEMINI_CODE_SANDBOX; -} - geminiSandbox = (geminiSandbox || '').toLowerCase(); const commandExists = (cmd) => {