Skip to content

Fix Autoupdate #189

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

Merged
manosim merged 2 commits into from
May 29, 2016
Merged

Fix Autoupdate #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb63ac
Fix autoupdate
May 29, 2016
1b9ec04
Merge branch 'master' into fix-autoupdate
May 29, 2016
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
Binary file modified images/press.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 16 additions & 17 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const app = electron.app;
const dialog = electron.dialog;
const ipc = electron.ipcMain;

var ghReleases = require('electron-gh-releases');
const GhReleases = require('electron-gh-releases');
var Positioner = require('electron-positioner');

var AutoLaunch = require('auto-launch');
Expand All @@ -31,7 +31,7 @@ app.on('ready', function() {
var appIcon = new Tray(iconIdle);
var windowPosition = (isWindows) ? 'trayBottomCenter' : 'trayCenter';

function confirmAutoUpdate(quitAndUpdate) {
function confirmAutoUpdate(installUpdate) {
dialog.showMessageBox({
type: 'question',
buttons: ['Update & Restart', 'Cancel'],
Expand All @@ -42,33 +42,32 @@ app.on('ready', function() {
console.log('Exit: ' + response);
app.dock.hide();
if (response === 0) {
quitAndUpdate();
installUpdate();
}
} );
}

function checkAutoUpdate(showAlert) {

var autoUpdateOptions = {
let autoUpdateOptions = {
repo: 'ekonstantinidis/gitify',
currentVersion: app.getVersion()
};

var update = new ghReleases(autoUpdateOptions, function (autoUpdater) {
autoUpdater
.on('error', function(event, message) {
console.log('ERRORED.');
console.log('Event: ' + JSON.stringify(event) + '. MESSAGE: ' + message);
})
.on('update-downloaded', function (event, releaseNotes, releaseName,
releaseDate, updateUrl, quitAndUpdate) {
console.log('Update downloaded');
confirmAutoUpdate(quitAndUpdate);
});
const updater = new GhReleases(autoUpdateOptions);

updater.on('error', (event, message) => {
console.log('ERRORED.');
console.log('Event: ' + JSON.stringify(event) + '. MESSAGE: ' + message);
});

updater.on('update-downloaded', (info) => {
console.log('Update downloaded');
confirmAutoUpdate(updater.install);
});

// Check for updates
update.check(function (err, status) {
updater.check((err, status) => {
if (err || !status) {
if (showAlert) {
dialog.showMessageBox({
Expand All @@ -82,7 +81,7 @@ app.on('ready', function() {
}

if (!err && status) {
update.download();
updater.download();
}
});
}
Expand Down