Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-27 12:26:38 +01:00
Code Issues Projects Releases Wiki Activity

allow dmg and mas builds

Browse Source
This commit is contained in:
Kyle Spearrin 2019-10-01 17:29:52 -04:00
parent a891bd71f8
commit 72bd3bc46f
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 53d08067df953e7a66ebf0b972e6443e1f275d86 Subproject commit 034aefa652459c9ed5a660fe13593e314ee368dc

2
scripts/after-sign.js
View File

@ -14,10 +14,12 @@ async function run(context) {
const macBuild = context.electronPlatformName === 'darwin'; const macBuild = context.electronPlatformName === 'darwin';
if (macBuild) { if (macBuild) {
/*
console.log('### Sign App w/ Safari Extension'); console.log('### Sign App w/ Safari Extension');
const proc = child.spawn('gulp', ['signMac']); const proc = child.spawn('gulp', ['signMac']);
stdOutProc(proc); stdOutProc(proc);
await new Promise((resolve) => proc.on('close', resolve)); await new Promise((resolve) => proc.on('close', resolve));
*/
console.log('### Notarizing ' + appPath); console.log('### Notarizing ' + appPath);
return await notarize({ return await notarize({

12
scripts/safari-build.ps1
View File

@ -1,5 +1,6 @@
param ( param (
[string] $version [string] $version,
[switch] $mas
) )
# Dependencies: # Dependencies:
@ -12,7 +13,8 @@ $dir = Split-Path -Parent $MyInvocation.MyCommand.Path;
$rootDir = $dir + "\.."; $rootDir = $dir + "\..";
$distDir = $rootDir + "\dist"; $distDir = $rootDir + "\dist";
$distSafariDir = $distDir + "\safari"; $distSafariDir = $distDir + "\safari";
$distSafariAppex = $distSafariDir + "\browser\dist\Safari\build\Release\safari.appex"; $distSafariAppexDmg = $distSafariDir + "\browser\dist\Safari\dmg\build\Release\safari.appex";
$distSafariAppexMas = $distSafariDir + "\browser\dist\Safari\mas\build\Release\safari.appex";
$pluginsAppex = $rootDir + "\PlugIns\safari.appex"; $pluginsAppex = $rootDir + "\PlugIns\safari.appex";
if(Test-Path -Path $distSafariDir) { if(Test-Path -Path $distSafariDir) {
@ -35,5 +37,9 @@ if(-not ([string]::IsNullOrEmpty($version))) {
npm i npm i
npm run dist:safari npm run dist:safari
Copy-Item -Path $distSafariAppex -Destination $pluginsAppex –Recurse if($mas) {
Copy-Item -Path $distSafariAppexMas -Destination $pluginsAppex –Recurse
} else {
Copy-Item -Path $distSafariAppexDmg -Destination $pluginsAppex –Recurse
}
cd $rootDir cd $rootDir