From cca23b4f07b3fef42d57027f82d0592426408c4a Mon Sep 17 00:00:00 2001 From: develar Date: Wed, 14 Sep 2016 07:49:00 +0200 Subject: [PATCH] fix(mac): throw sign error correctly Closes #737 --- package.json | 2 +- src/macPackager.ts | 2 +- test/src/globTest.ts | 6 +++--- test/src/macPackagerTest.ts | 2 +- test/tsconfig.json | 2 +- tsconfig.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 73366e5adff..720f6246648 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "cuint": "^0.2.2", "debug": "^2.2.0", "electron-download": "2.1.2", - "electron-osx-sign": "^0.4.0-beta4", + "electron-osx-sign-tf": "^1.0.0", "extract-zip": "^1.5.0", "fs-extra-p": "^1.1.8", "hosted-git-info": "^2.1.5", diff --git a/src/macPackager.ts b/src/macPackager.ts index 7ddaefd3a59..b1c29cd1dce 100644 --- a/src/macPackager.ts +++ b/src/macPackager.ts @@ -6,7 +6,7 @@ import { Promise as BluebirdPromise } from "bluebird" import { log, warn, task } from "./util/log" import { createKeychain, CodeSigningInfo, findIdentity } from "./codeSign" import { deepAssign } from "./util/deepAssign" -import { signAsync, flatAsync, BaseSignOptions, SignOptions, FlatOptions } from "electron-osx-sign" +import { signAsync, flatAsync, BaseSignOptions, SignOptions, FlatOptions } from "electron-osx-sign-tf" import { DmgTarget } from "./targets/dmg" import { createCommonTarget, DEFAULT_TARGET } from "./targets/targetFactory" import { AppInfo } from "./appInfo" diff --git a/test/src/globTest.ts b/test/src/globTest.ts index c707865b897..3be5e64ffa7 100644 --- a/test/src/globTest.ts +++ b/test/src/globTest.ts @@ -151,16 +151,16 @@ test.ifNotCiOsx("ignore node_modules known dev dep", () => { return BluebirdPromise.all([ modifyPackageJson(projectDir, data => { data.devDependencies = Object.assign({ - "electron-osx-sign": "*", + "electron-osx-sign-tf": "*", }, data.devDependencies) }), - outputFile(path.join(projectDir, "node_modules", "electron-osx-sign", "package.json"), "{}"), + outputFile(path.join(projectDir, "node_modules", "electron-osx-sign-tf", "package.json"), "{}"), outputFile(path.join(projectDir, "ignoreMe"), ""), ]) }, packed: context => { return BluebirdPromise.all([ - assertThat(path.join(context.getResources(Platform.LINUX), "app", "node_modules", "electron-osx-sign")).doesNotExist(), + assertThat(path.join(context.getResources(Platform.LINUX), "app", "node_modules", "electron-osx-sign-tf")).doesNotExist(), assertThat(path.join(context.getResources(Platform.LINUX), "app", "ignoreMe")).doesNotExist(), ]) }, diff --git a/test/src/macPackagerTest.ts b/test/src/macPackagerTest.ts index cb015707e05..0fd1e539f7f 100644 --- a/test/src/macPackagerTest.ts +++ b/test/src/macPackagerTest.ts @@ -7,7 +7,7 @@ import { BuildInfo } from "out/platformPackager" import { Promise as BluebirdPromise } from "bluebird" import { assertThat } from "./helpers/fileAssert" import { Platform, MacOptions, createTargets } from "out" -import { SignOptions, FlatOptions } from "electron-osx-sign" +import { SignOptions, FlatOptions } from "electron-osx-sign-tf" import { Arch } from "out" import { Target } from "out/platformPackager" import { DmgTarget } from "out/targets/dmg" diff --git a/test/tsconfig.json b/test/tsconfig.json index 2e2e0b5867b..135b13e5428 100755 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -22,7 +22,7 @@ "../node_modules/ava-tf/types/generated.d.ts", "../node_modules/fs-extra-p/index.d.ts", "../node_modules/fs-extra-p/bluebird.d.ts", - "../node_modules/electron-osx-sign/index.d.ts", + "../node_modules/electron-osx-sign-tf/index.d.ts", "../node_modules/@types/**/*.d.ts" ], "exclude": [ diff --git a/tsconfig.json b/tsconfig.json index 3f27f947589..22f59bfe1c7 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,7 +26,7 @@ "node_modules/fs-extra-p/index.d.ts", "node_modules/7zip-bin/index.d.ts", "node_modules/fs-extra-p/bluebird.d.ts", - "node_modules/electron-osx-sign/index.d.ts", + "node_modules/electron-osx-sign-tf/index.d.ts", "node_modules/@types/**/*.d.ts" ], "exclude": [