Skip to content

Commit 93dc368

Browse files
committed
Fix build, protect app updates crashing the app
1 parent 067b92d commit 93dc368

File tree

6 files changed

+32
-26
lines changed

6 files changed

+32
-26
lines changed

app/assets/TrayIconTemplate.png

-39 Bytes
Loading

app/assets/TrayIconTemplate@2x.png

-85 Bytes
Loading

app/main.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ app.on('ready', () => {
6464
readPrefs();
6565
setupUiMode(uiMode, {firstRun: true});
6666
if (!DEV_MODE) {
67-
checkForAppUpdates();
67+
try {
68+
checkForAppUpdates();
69+
} catch (e){
70+
console.error(e);
71+
}
6872
}
6973
});
7074

gulpfile.js

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const gulp = require('gulp');
2020
const $ = require('gulp-load-plugins')();
2121
const del = require('del');
2222
const merge = require('merge-stream');
23-
const runSequence = require('run-sequence');
2423
const electronPackager = require('electron-packager');
2524
const electronOsxSignAsync = require('electron-osx-sign').signAsync;
2625
const argv = require('yargs').argv;
@@ -92,15 +91,15 @@ gulp.task('clean', cb => {
9291

9392
gulp.task('build', gulp.series('clean', 'styles', 'scripts', 'copy'));
9493

95-
gulp.task('install-packages', gulp.series('build', $.shell.task([
94+
gulp.task('install-packages', gulp.series($.shell.task([
9695
'npm install --production'
9796
], { cwd: 'build' })));
9897

99-
gulp.task('run-electron', gulp.series('build', $.shell.task([
98+
gulp.task('run-electron', gulp.series($.shell.task([
10099
'electron ./build/ --dev'
101100
])));
102101

103-
gulp.task('dist', gulp.series('build', 'install-packages', async cb => {
102+
gulp.task('dist', gulp.series('build', 'install-packages', async () => {
104103
let packageInfo = require('./build/package.json');
105104
let appPaths = await electronPackager({
106105
arch: 'x64',
@@ -135,24 +134,27 @@ gulp.task('dist', gulp.series('build', 'install-packages', async cb => {
135134
// https://developer.apple.com/library/content/qa/qa1940/_index.html
136135
execSync(`xattr -cr "${appFilePath}"`);
137136

138-
plistStream.on('end', async () => {
139-
// Sign the app
140-
await electronOsxSignAsync({
141-
app: appFilePath,
142-
identity: 'Developer ID Application: Roman NURIK (NLACF347G7)',
143-
platform: 'darwin'
137+
await new Promise((resolve, reject) => {
138+
plistStream.on('end', async () => {
139+
// Sign the app
140+
await electronOsxSignAsync({
141+
app: appFilePath,
142+
identity: 'Developer ID Application: Roman NURIK (NLACF347G7)',
143+
platform: 'darwin'
144+
});
145+
146+
// zip up the directory
147+
console.log('Zipping up the package');
148+
let zipStream = fs.createWriteStream(`./dist/${packageInfo.version}.zip`)
149+
.on('warning', err => { throw err; })
150+
.on('error', err => { throw err; })
151+
.on('close', () => resolve());
152+
let archive = archiver('zip', {zlib: {level: 9}})
153+
archive.pipe(zipStream);
154+
archive.directory(appFilePath, `${packageInfo.appDisplayName}.app`);
155+
archive.finalize();
144156
});
145-
146-
// zip up the directory
147-
console.log('Zipping up the package');
148-
let zipStream = fs.createWriteStream(`./dist/${packageInfo.version}.zip`)
149-
.on('error', err => { throw err })
150-
.on('end', () => cb());
151-
let archive = archiver('zip', {zlib: {level: 9}})
152-
archive.pipe(zipStream);
153-
archive.directory(appFilePath, `${packageInfo.appDisplayName}.app`);
154-
archive.finalize();
155157
});
156158
}));
157159

158-
gulp.task('default', gulp.series('run-electron'));
160+
gulp.task('default', gulp.series('build', 'run-electron'));

icon.icns

229 KB
Binary file not shown.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
"appDisplayName": "Material Colors",
44
"productName": "Material Colors",
55
"appBundleId": "net.nurik.roman.materialcolors",
6-
"version": "1.1.1",
6+
"version": "2.0.0",
77
"description": "A quick color palette for material design colors.",
88
"main": "main.js",
99
"author": "Roman Nurik",
1010
"private": true,
1111
"scripts": {
12-
"start": "gulp"
12+
"start": "gulp",
13+
"build": "gulp dist"
1314
},
1415
"devDependencies": {
1516
"archiver": "^3.1.1",
@@ -25,8 +26,7 @@
2526
"gulp-rename": "^1.4.0",
2627
"gulp-sass": "^4.0.2",
2728
"gulp-shell": "^0.7.1",
28-
"merge-stream": "^2.0.0",
29-
"run-sequence": "^2.2.1"
29+
"merge-stream": "^2.0.0"
3030
},
3131
"dependencies": {
3232
"electron-positioner": "^4.1.0",

0 commit comments

Comments
 (0)