fix signing paths

and workaround mas-dev issue
https://github.com/electron-userland/electron-builder/pull/6660
pull/982/head
Mikael Finstad 5 years ago
parent f1654d1831
commit 1ad8b55abb
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26

@ -270,9 +270,9 @@
"entitlementsInherit": "entitlements.mas.inherit.plist",
"provisioningProfile": "LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile",
"binaries": [
"dist/mas/LosslessCut.app/Contents/Resources/ffmpeg",
"dist/mas/LosslessCut.app/Contents/Resources/ffprobe",
"dist/mas/LosslessCut.app/Contents/Resources/app.asar.unpacked/node_modules/trash/lib/macos-trash"
"Contents/Resources/ffmpeg",
"Contents/Resources/ffprobe",
"Contents/Resources/app.asar.unpacked/node_modules/trash/lib/macos-trash"
]
},
"win": {

@ -0,0 +1,22 @@
diff --git a/node_modules/app-builder-lib/out/macPackager.js b/node_modules/app-builder-lib/out/macPackager.js
index e0b51e3..c9e1ce5 100644
--- a/node_modules/app-builder-lib/out/macPackager.js
+++ b/node_modules/app-builder-lib/out/macPackager.js
@@ -199,15 +199,13 @@ class MacPackager extends platformPackager_1.PlatformPackager {
let binaries = options.binaries || undefined;
if (binaries) {
// Accept absolute paths for external binaries, else resolve relative paths from the artifact's app Contents path.
- const userDefinedBinaries = await Promise.all(binaries.map(async (destination) => {
+ binaries = await Promise.all(binaries.map(async (destination) => {
if (await fs_1.statOrNull(destination)) {
return destination;
}
return path.resolve(appPath, destination);
}));
- // Insert at front to prioritize signing. We still sort by depth next
- binaries = userDefinedBinaries.concat(binaries);
- builder_util_1.log.info("Signing addtional user-defined binaries: " + JSON.stringify(userDefinedBinaries, null, 1));
+ builder_util_1.log.info("Signing addtional user-defined binaries: " + JSON.stringify(binaries, null, 1));
}
const signOptions = {
"identity-validation": false,
Loading…
Cancel
Save