fix

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

code/src/vs/server/node/remoteTerminalChannel.ts

@@ -34,6 +34,29 @@ import { ILogService } from '../../platform/log/common/log.js';
 import { promiseWithResolvers } from '../../base/common/async.js';
 import { shouldUseEnvironmentVariableCollection } from '../../platform/terminal/common/terminalEnvironment.js';
 
+const cheCodeLdLibPrefixes = new Set<string>([
+	'/checode/checode-linux-libc/ubi8/ld_libs',
+	'/checode/checode-linux-libc/ubi9/ld_libs',
+	'/checode/checode-linux-musl/ld_libs'
+]);
+
+function stripCheCodeLdLibraryPath(environment: platform.IProcessEnvironment): void {
+	const current = environment['LD_LIBRARY_PATH'];
+	if (!current) {
+		return;
+	}
+	const filtered = current
+		.split(':')
+		.map(entry => entry.trim())
+		.filter(entry => !!entry && !cheCodeLdLibPrefixes.has(entry))
+		.join(':');
+	if (filtered) {
+		environment['LD_LIBRARY_PATH'] = filtered;
+	} else {
+		delete environment['LD_LIBRARY_PATH'];
+	}
+}
+
 class CustomVariableResolver extends AbstractVariableResolverService {
 	constructor(
 		env: platform.IProcessEnvironment,
@@ -208,6 +231,9 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 
 
 		const baseEnv = await buildUserEnvironment(args.resolverEnv, !!args.shellLaunchConfig.useShellEnvironment, platform.language, this._environmentService, this._logService, this._configurationService);
+		if (process.env['CHECODE_STRIP_LD_LIBRARY_PATH_FOR_SHELL_ENV'] === '1') {
+			stripCheCodeLdLibraryPath(baseEnv);
+		}
 		this._logService.trace('baseEnv', baseEnv);
 
 		const reviveWorkspaceFolder = (workspaceData: IWorkspaceFolderData): IWorkspaceFolder => {
@@ -240,6 +266,9 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 			args.configuration['terminal.integrated.detectLocale'],
 			baseEnv
 		);
+		if (process.env['CHECODE_STRIP_LD_LIBRARY_PATH_FOR_SHELL_ENV'] === '1') {
+			stripCheCodeLdLibraryPath(env);
+		}
 
 		// Apply extension environment variable collections to the environment
 		if (shouldUseEnvironmentVariableCollection(shellLaunchConfig)) {
@@ -330,16 +359,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 	private _getEnvironment(): platform.IProcessEnvironment {
 		const env: platform.IProcessEnvironment = { ...process.env };
 		if (process.env['CHECODE_STRIP_LD_LIBRARY_PATH_FOR_SHELL_ENV'] === '1') {
-			const filtered = (env['LD_LIBRARY_PATH'] || '')
-				.split(':')
-				.map(entry => entry.trim())
-				.filter(entry => !!entry && entry !== '/checode/checode-linux-libc/ubi8/ld_libs' && entry !== '/checode/checode-linux-libc/ubi9/ld_libs' && entry !== '/checode/checode-linux-musl/ld_libs')
-				.join(':');
-			if (filtered) {
-				env['LD_LIBRARY_PATH'] = filtered;
-			} else {
-				delete env['LD_LIBRARY_PATH'];
-			}
+			stripCheCodeLdLibraryPath(env);
 		}
 		return env;
 	}