Remove warnings for old env var names. (#920)

This commit is contained in:
Tommaso Sciortino 2025-06-10 18:34:36 -07:00 committed by GitHub
parent e92b7dfd74
commit 97e08fc804
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 31 deletions

View File

@ -9,8 +9,7 @@ import { render } from 'ink';
import { AppWrapper } from './ui/App.js'; import { AppWrapper } from './ui/App.js';
import { loadCliConfig } from './config/config.js'; import { loadCliConfig } from './config/config.js';
import { readStdin } from './utils/readStdin.js'; import { readStdin } from './utils/readStdin.js';
import { fileURLToPath } from 'node:url'; import { basename } from 'node:path';
import { dirname, basename } from 'node:path';
import { sandbox_command, start_sandbox } from './utils/sandbox.js'; import { sandbox_command, start_sandbox } from './utils/sandbox.js';
import { LoadedSettings, loadSettings } from './config/settings.js'; import { LoadedSettings, loadSettings } from './config/settings.js';
import { themeManager } from './ui/themes/theme-manager.js'; import { themeManager } from './ui/themes/theme-manager.js';
@ -34,33 +33,11 @@ import {
WriteFileTool, WriteFileTool,
} from '@gemini-cli/core'; } from '@gemini-cli/core';
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
export async function main() { export async function main() {
const workspaceRoot = process.cwd(); const workspaceRoot = process.cwd();
const settings = loadSettings(workspaceRoot); const settings = loadSettings(workspaceRoot);
setWindowTitle(basename(workspaceRoot), settings); 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); const geminiIgnorePatterns = loadGeminiIgnorePatterns(workspaceRoot);
if (settings.errors.length > 0) { if (settings.errors.length > 0) {

View File

@ -63,13 +63,6 @@ if (!geminiSandbox) {
geminiSandbox = process.env.GEMINI_SANDBOX; 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(); geminiSandbox = (geminiSandbox || '').toLowerCase();
const commandExists = (cmd) => { const commandExists = (cmd) => {