Skip to content

Commit

Permalink
fix(mac): throw sign error correctly
Browse files Browse the repository at this point in the history
Closes #737
  • Loading branch information
develar committed Sep 14, 2016
1 parent 49ec5fd commit cca23b4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/macPackager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions test/src/globTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
])
},
Expand Down
2 changes: 1 addition & 1 deletion test/src/macPackagerTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down

0 comments on commit cca23b4

Please sign in to comment.