fix: /usr/bin/file can return errors on MacOS; ignore these errors (#13 )

Co-authored-by: Andrew Plotkin <zarf@ZarfLent.local>
build(deps): bump ssri from 6.0.1 to 6.0.2 (#19 )
2021-05-08 21:14:36 -07:00 · 2021-05-08 21:13:52 -07:00 · 2021-04-05 23:11:27 -05:00 · 2021-04-01 07:54:28 +00:00 · 2020-12-14 09:11:26 -08:00 · 2020-11-26 13:42:27 -08:00
3 changed files with 22 additions and 13 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 > Create universal macOS Electron applications

-[![CircleCI](https://circleci.com/gh/electron/universal.svg?style=svg)](https://circleci.com/gh/electron/universal)
+[![CircleCI](https://circleci.com/gh/electron/universal/tree/master.svg?style=svg)](https://circleci.com/gh/electron/universal)


 ## Usage
@@ -33,4 +33,4 @@ your x64 and arm64 apps work in isolation the Universal app will work as well.

 #### How do I build my app for Apple silicon in the first place?

-Check out the [Electron Apple silicon blog post](https://www.electronjs.org/blog/apple-silicon)
+Check out the [Electron Apple silicon blog post](https://www.electronjs.org/blog/apple-silicon)
--- a/src/file-utils.ts
+++ b/src/file-utils.ts
@@ -1,4 +1,4 @@
-import { spawn } from '@malept/cross-spawn-promise';
+import { spawn, ExitCodeError } from '@malept/cross-spawn-promise';
 import * as fs from 'fs-extra';
 import * as path from 'path';

@@ -34,7 +34,16 @@ export const getAllAppFiles = async (appPath: string): Promise<AppFile[]> => {
    if (info.isFile()) {
      let fileType = AppFileType.PLAIN;

-      const fileOutput = await spawn('file', ['--brief', '--no-pad', p]);
+      var fileOutput = '';
+      try {
+        fileOutput = await spawn('file', ['--brief', '--no-pad', p]);
+      } catch (e) {
+        if (e instanceof ExitCodeError) {
+          /* silently accept error codes from "file" */
+        } else {
+          throw e;
+        }
+      }
      if (p.includes('app.asar')) {
        fileType = AppFileType.APP_CODE;
      } else if (fileOutput.startsWith(MACHO_PREFIX)) {
--- a/yarn.lock
+++ b/yarn.lock
@@ -2075,9 +2075,9 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1,
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==

 init-package-json@^1.10.3:
  version "1.10.3"
@@ -4404,9 +4404,9 @@ sshpk@^1.7.0:
    tweetnacl "~0.14.0"

 ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
  dependencies:
    figgy-pudding "^3.5.1"

@@ -5043,9 +5043,9 @@ xtend@~4.0.1:
  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==

 y18n@^4.0.0:
  version "4.0.0"
Author	SHA1	Message	Date
Andrew Plotkin	e7d57dd1e5	fix: /usr/bin/file can return errors on MacOS; ignore these errors (#13 ) Co-authored-by: Andrew Plotkin <zarf@ZarfLent.local>	2021-05-08 21:14:36 -07:00
dependabot[bot]	d9b1b4104f	build(deps): bump ssri from 6.0.1 to 6.0.2 (#19 ) Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-08 21:13:52 -07:00
Charles Kerr	b445fa1974	Merge pull request #15 from electron/dependabot/npm_and_yarn/y18n-3.2.2 build(deps): bump y18n from 3.2.1 to 3.2.2	2021-04-05 23:11:27 -05:00
dependabot[bot]	f265d1f5e2	build(deps): bump y18n from 3.2.1 to 3.2.2 Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-01 07:54:28 +00:00
dependabot[bot]	a05a5e6db8	build(deps): bump ini from 1.3.5 to 1.3.8 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8) Signed-off-by: dependabot[bot] <support@github.com>	2020-12-14 09:11:26 -08:00
Samuel Attard	8c55e5b4f3	docs: update CircleCI readme badge	2020-11-26 13:42:27 -08:00