Tune

lib/app-utils.js

@@ -5,6 +5,7 @@ import log from './logger.js';
 import {LRUCache} from 'lru-cache';
 import os from 'node:os';
 import {exec} from 'teen_process';
+import B from 'bluebird';
 
 const STRINGSDICT_RESOURCE = '.stringsdict';
 const STRINGS_RESOURCE = '.strings';
@@ -129,18 +130,24 @@ export async function verifyApplicationPlatform(app, expectedPlatform) {
   }
   if (isSimulator) {
     const executablePath = path.resolve(app, await extractExecutableName(app));
-    const {stdout} = await exec('file', [executablePath]);
-    log.debug(_.trim(stdout));
-    const {stdout: archRaw} = await exec('uname', ['-m']);
-    const arch = _.trim(archRaw);
+    const [resFile, resUname] = await B.all([
+      exec('file', [executablePath]),
+      exec('uname', ['-m']),
+    ]);
+    log.debug(_.trim(resFile.stdout));
+    const arch = _.trim(resUname.stdout);
     const isArm = os.cpus[0].model.includes('Apple');
     // We cannot run Simulator builds compiled for arm64 on Intel machines
     // Rosetta allows only to run Intel ones on arm64
-    if (!_.includes(stdout, `executable ${arch}`) && !(isArm && _.includes(stdout, 'executable x86_64'))) {
+    if (
+      !_.includes(resFile.stdout, `executable ${arch}`) &&
+      !(isArm && _.includes(resFile.stdout, 'executable x86_64'))
+    ) {
       const bundleId = await extractBundleId(app);
-      throw new Error(`The ${bundleId} application is built for non-${arch} Simulator ` +
-        `architecture:\n${_.trim(stdout)}\nand is not supported on the current platform. ` +
-        `Please rebuild your application to support the ${arch} platform.`
+      throw new Error(
+        `The ${bundleId} application does not support the ${arch} Simulator ` +
+          `architecture:\n${_.trim(resFile.stdout)}\n\n` +
+          `Please rebuild your application to support the ${arch} platform.`,
       );
     }
   }