fix: address review comments

Change-Id: Ie57921d60436e4013ade926c662afd03d3e82317

Author: richard-townsend-arm

build/lib/electron.js

@@ -98,10 +98,7 @@ function getElectron(arch) {
             .pipe(vfs.dest('.build/electron'));
     };
 }
-async function main(arch = process.arch) {
-    if (process.env["npm_config_arch"]) {
-        arch = process.env["npm_config_arch"];
-    }
+async function main(arch = process.env["npm_config_arch"] || process.arch) {
     const version = getElectronVersion();
     const electronPath = path.join(root, '.build', 'electron');
     const versionFile = path.join(electronPath, 'version');

build/lib/electron.ts

@@ -107,10 +107,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 	};
 }
 
-async function main(arch = process.arch): Promise<void> {
-	if (process.env["npm_config_arch"]) {
-		arch = process.env["npm_config_arch"] as string;
-	}
+async function main(arch = process.env["npm_config_arch"] || process.arch): Promise<void> {
 	const version = getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');

build/npm/postinstall.js

@@ -23,17 +23,14 @@ function yarnInstall(location, opts) {
 	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
 
 	console.log(`Installing dependencies in ${location}...`);
-	const oldConfigArch = process.env['npm_config_arch']
-	if (location.startsWith("remote") && oldConfigArch == "arm64") {
-		// Temporarily set remote arch to x86, because remote portion builds
+	if (location.startsWith("remote") && process.env["npm_config_arch"] == "arm64") {
+		// Temporarily set remote arch to x86, because the remote portion builds
 		// against node, which is not consistently supported on Windows on Arm
 		// (yet).
-		process.env["npm_config_arch"] = "ia32"
+		opts.npm_config_arch = "ia32"
 	}
 	console.log(`$ yarn ${args.join(' ')}`);
 	const result = cp.spawnSync(yarn, args, opts);
-	// Restore the architecture, if temporarily swapped.
-	process.env["npm_config_arch"] = oldConfigArch
 	if (result.error || result.status !== 0) {
 		process.exit(1);
 	}