Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: consume some env variables from bash instead of JS #5696

Merged
a-b-r-o-w-n merged 2 commits into from
Feb 4, 2021
Merged

fix: consume some env variables from bash instead of JS #5696

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc871ce
consume some env variables from bash instead of JS
a-b-r-o-w-n Feb 4, 2021
eab2c88
update DEV_CERT_ID to be consumed in bash
a-b-r-o-w-n Feb 4, 2021
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
16 changes: 8 additions & 8 deletions Composer/packages/electron-server/scripts/sign-mac.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const fs = require('fs');
const path = require('path');
// eslint-disable-next-line security/detect-child-process
const { execSync } = require('child_process');

const glob = require('globby');

const { log } = require('./common');
Expand Down Expand Up @@ -86,13 +87,12 @@ try {
execSync(`security unlock-keychain -p pwd ${keychainPath}`, { stdio: 'inherit' });

log.info(`echo ********* | base64 -D > ${certPath}`);
execSync(`echo ${process.env.DEV_CERT} | base64 -D > ${certPath}`, { stdio: 'inherit' });
execSync(`echo "$DEV_CERT" | base64 -D > ${certPath}`, { stdio: 'inherit' });

log.info(`security import ${certPath} -k ${keychainPath} -P "*********" -T /usr/bin/codesign`);
execSync(
`security import ${certPath} -k ${keychainPath} -P "${process.env.DEV_CERT_PASSWORD}" -T /usr/bin/codesign`,
{ stdio: 'inherit' }
);
execSync(`security import ${certPath} -k ${keychainPath} -P "$DEV_CERT_PASSWORD" -T /usr/bin/codesign`, {
stdio: 'inherit',
});

log.info(`security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd ${keychainPath}`);
execSync(`security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd ${keychainPath}`, {
Expand All @@ -114,13 +114,13 @@ try {

for (const lib of dylibs) {
log.info(`codesign -s ******* --timestamp=none --force "${path.join(fwPath, lib)}"`);
execSync(`codesign -s ${process.env.DEV_CERT_ID} --timestamp=none --force "${path.join(fwPath, lib)}"`, {
execSync(`codesign -s $DEV_CERT_ID --timestamp=none --force "${path.join(fwPath, lib)}"`, {
stdio: 'inherit',
});
}

log.info(`codesign -s ******* --timestamp=none --force "${fwPath}"`);
execSync(`codesign -s ${process.env.DEV_CERT_ID} --timestamp=none --force "${fwPath}"`, {
execSync(`codesign -s $DEV_CERT_ID --timestamp=none --force "${fwPath}"`, {
stdio: 'inherit',
});
}
Expand All @@ -136,7 +136,7 @@ try {
`codesign -s ******* --timestamp=none --force --options runtime --entitlements "${bundle.entitlements}" "${bundle.path}"`
);
execSync(
`codesign -s ${process.env.DEV_CERT_ID} --timestamp=none --force --options runtime --entitlements "${bundle.entitlements}" "${bundle.path}"`,
`codesign -s $DEV_CERT_ID --timestamp=none --force --options runtime --entitlements "${bundle.entitlements}" "${bundle.path}"`,
{ stdio: 'inherit' }
);
}
Expand Down