jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-28 05:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #150 from resin-io/refactor/unify-elevation-error-handling

Browse Source 
Unify handling of elevation errors in etcher.js
This commit is contained in:
Juan Cruz Viotti 2016-02-08 14:39:43 -04:00
commit efb2c4c911
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/elevate.js
View File

@ -42,8 +42,7 @@ exports.require = function(app, callback) {
sudoPrompt.setName('Etcher'); sudoPrompt.setName('Etcher');
sudoPrompt.exec(process.argv.join(' '), function(error) { sudoPrompt.exec(process.argv.join(' '), function(error) {
if (error) { if (error) {
electron.dialog.showErrorBox('Elevation Error', error.message); return callback(error);
process.exit(1);
} }
// Don't keep the original parent process alive // Don't keep the original parent process alive
@ -54,8 +53,7 @@ exports.require = function(app, callback) {
elevator.execute(process.argv, {}, function(error) { elevator.execute(process.argv, {}, function(error) {
if (error) { if (error) {
electron.dialog.showErrorBox('Elevation Error', error.message); return callback(error);
process.exit(1);
} }
// Don't keep the original parent process alive // Don't keep the original parent process alive

3
lib/etcher.js
View File

@ -31,7 +31,8 @@ electron.app.on('ready', function() {
elevate.require(electron.app, function(error) { elevate.require(electron.app, function(error) {
if (error) { if (error) {
throw error; electron.dialog.showErrorBox('Elevation Error', error.message);
process.exit(1);
} }
mainWindow = new electron.BrowserWindow({ mainWindow = new electron.BrowserWindow({