build-strap 5.0.4-dev.105 → 5.0.4-dev.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-strap",
-  "version": "5.0.4-dev.105",
+  "version": "5.0.4-dev.115",
   "description": "Node scripts for building things",
   "license": "MIT",
   "authors": [

package/src/env.js

@@ -66,7 +66,10 @@ export const readShellEnvVar = async (name, { refreshEnv = true, envFile = shell
         throw new Error(`Could not find shell env file: ${envFile}`);
     }
     try {
-        return (await spawn(shell, ['-c', `${refreshEnv ? `source ${envFile} && ` : ''}printenv ${name}`], {
+        return (await spawn(shell, [
+            '-c',
+            `${refreshEnv ? `source ${envFile} > /dev/null 2>&1  && ` : ''}printenv ${name}`,
+        ], {
             captureOutput: true,
             env: {
                 ...process.env,

package/src/macos.d.ts

@@ -1,3 +1,4 @@
 export declare const mountDmg: (dmgPath: string, mountPath: string) => Promise<void>;
 export declare const unmountDmg: (mountPath: string) => Promise<void>;
 export declare const ensureXcodeCmdInstalled: (ignoreNonMac?: boolean) => Promise<void>;
+export declare const ensureRosettaInstalled: (ignoreNonMac?: boolean) => Promise<void>;

package/src/macos.js

@@ -34,3 +34,15 @@ export const ensureXcodeCmdInstalled = async (ignoreNonMac = true) => {
         });
     }
 };
+export const ensureRosettaInstalled = async (ignoreNonMac = true) => {
+    if (!isMac()) {
+        if (!ignoreNonMac) {
+            throw new Error('Cannot install Rosetta on non-macOS');
+        }
+        return;
+    }
+    if (!(await fs.pathExists('/usr/libexec/rosetta'))) {
+        buildLog('Installing Rosetta...');
+        await spawn('softwareupdate', ['--install-rosetta', '--agree-to-license']);
+    }
+};