Merge pull request #7152 from Elias-Graf/fix_get_unix_arch_env

Add missing env to `GetUnixArchitecture`

Author: dibarbet

src/common.ts

@@ -58,8 +58,8 @@ export function safeLength<T>(arr: T[] | undefined) {
 
 export async function execChildProcess(
     command: string,
-    workingDirectory: string = getExtensionPath(),
-    env: NodeJS.ProcessEnv = {}
+    workingDirectory: string,
+    env: NodeJS.ProcessEnv
 ): Promise<string> {
     return new Promise<string>((resolve, reject) => {
         cp.exec(command, { cwd: workingDirectory, maxBuffer: 500 * 1024, env: env }, (error, stdout, stderr) => {

src/shared/platform.ts

@@ -173,7 +173,7 @@ export class PlatformInformation {
     }
 
     private static async GetUnixArchitecture(): Promise<string> {
-        const architecture = (await util.execChildProcess('uname -m', __dirname)).trim();
+        const architecture = (await util.execChildProcess('uname -m', __dirname, process.env)).trim();
         if (architecture === 'aarch64') {
             return 'arm64';
         }
@@ -183,7 +183,7 @@ export class PlatformInformation {
     // Emulates https://github.com/dotnet/install-scripts/blob/3c6cc06/src/dotnet-install.sh#L187-L189.
     private static async GetIsMusl(): Promise<boolean> {
         try {
-            const output = await util.execChildProcess('ldd --version', __dirname);
+            const output = await util.execChildProcess('ldd --version', __dirname, process.env);
             return output.includes('musl');
         } catch (err) {
             return err instanceof Error ? err.message.includes('musl') : false;

test/vscodeLauncher.ts

@@ -69,7 +69,7 @@ async function main() {
             }
 
             const dotnetPath = path.join(process.env.DOTNET_ROOT, 'dotnet');
-            await execChildProcess(`${dotnetPath} build ${sln}`, workspacePath);
+            await execChildProcess(`${dotnetPath} build ${sln}`, workspacePath, process.env);
         }
 
         // Download VS Code, unzip it and run the integration test