Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename entitlements file #56

Merged
merged 1 commit into from
Jun 1, 2016
Merged

Rename entitlements file #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ Default to `null`.
`entitlements` - *String*

Path to entitlements file for signing the app.
See [default.mas.entitlements](https://github.com/electron-userland/electron-osx-sign/blob/master/default.mas.entitlements) or [default.darwin.entitlements](https://github.com/electron-userland/electron-osx-sign/blob/master/default.darwin.entitlements) for default.
See [default.entitlements.mas.plist](https://github.com/electron-userland/electron-osx-sign/blob/master/default.entitlements.mas.plist) or [default.entitlements.darwin.plist](https://github.com/electron-userland/electron-osx-sign/blob/master/default.entitlements.darwin.plist) for default.

`entitlements-inherit` - *String*

Path to child entitlements which inherit the security settings for signing frameworks and bundles of a distribution. *This option only applies when signing with `entitlements` provided, or for a `mas` platform version.*
See [default.mas.inherit.entitlements](https://github.com/electron-userland/electron-osx-sign/blob/master/default.mas.inherit.entitlements) or [default.darwin.inherit.entitlements](https://github.com/electron-userland/electron-osx-sign/blob/master/default.darwin.inherit.entitlements) for default.
See [default.entitlements.mas.inherit.plist](https://github.com/electron-userland/electron-osx-sign/blob/master/default.entitlements.mas.inherit.plist) or [default.entitlements.darwin.inherit.plist](https://github.com/electron-userland/electron-osx-sign/blob/master/default.entitlements.darwin.inherit.plist) for default.

`identity` - *String*

Expand Down
0 default.darwin.inherit.plist → default.entitlements.darwin.inherit.plist
View file
Open in desktop
File renamed without changes.
0 default.darwin.plist → default.entitlements.darwin.plist
View file
Open in desktop
File renamed without changes.
0 default.mas.inherit.plist → default.entitlements.mas.inherit.plist
View file
Open in desktop
File renamed without changes.
0 default.mas.plist → default.entitlements.mas.plist
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ function signAsync (opts) {
// Further reading: https://developer.apple.com/library/mac/documentation/Miscellaneous/Reference/EntitlementKeyReference/Chapters/EnablingAppSandbox.html
if (!opts.entitlements) {
debugwarn('No `entitlements` passed in arguments, will fallback to default settings.')
opts.entitlements = path.join(__dirname, 'default.mas.plist')
opts.entitlements = path.join(__dirname, 'default.entitlements.mas.plist')
}
if (!opts['entitlements-inherit']) {
debugwarn('No `entitlements-inherit` passed in arguments, will fallback to default settings.')
opts['entitlements-inherit'] = path.join(__dirname, 'default.mas.inherit.plist')
opts['entitlements-inherit'] = path.join(__dirname, 'default.entitlements.mas.inherit.plist')
}
} else if (opts.platform === 'darwin') {
// Not necessary to have entitlements for non Mac App Store distribution
Expand All @@ -469,11 +469,11 @@ function signAsync (opts) {
// If entitlements is provided as a flag, fallback to default
if (opts.entitlements === true) {
debugwarn('`entitlements` not specified in arguments, will fallback to default settings.')
opts.entitlements = path.join(__dirname, 'default.darwin.plist')
opts.entitlements = path.join(__dirname, 'default.entitlements.darwin.plist')
}
if (!opts['entitlements-inherit']) {
debugwarn('No `entitlements-inherit` passed in arguments, will fallback to default settings.')
opts['entitlements-inherit'] = path.join(__dirname, 'default.darwin.inherit.plist')
opts['entitlements-inherit'] = path.join(__dirname, 'default.entitlements.darwin.inherit.plist')
}
}
} else {
Expand Down