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

Fix GNU/Linux not opening an external resource when elevated (#446)

Browse Source 
We currently had a workaround in place to make use of `node-open`
instead of Electron's built-in `shell` module since the latter didn't
work on older Electron versions on GNU/Linux for some reason.

After some experimentation, `node-open` doesn't seem to be working for
elevated applications anymore. I honestly didn't chase the issue further
since Electron `shell` has been fixed, and works fine when elevated,
therefore this PR basically undoes the previous workaround.

Fixes: https://github.com/resin-io/etcher/issues/443
Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
This commit is contained in:
Juan Cruz Viotti 2016-05-26 21:18:03 -04:00
parent 28e6cb3f79
commit b14e94fc3b
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/gui/os/open-external/directives/open-external.js
View File

@ -18,7 +18,6 @@
const electron = require('electron'); const electron = require('electron');
const os = require('os'); const os = require('os');
const nodeOpen = require('open');
/** /**
* @summary OsOpenExternal directive * @summary OsOpenExternal directive
@ -45,25 +44,6 @@ module.exports = function() {
element.css('cursor', 'pointer'); element.css('cursor', 'pointer');
element.on('click', function() { element.on('click', function() {
// Electron's `shell.openExternal()` fails on GNU/Linux
// when Electron is ran with `sudo`.
// The issue was reported, and this is a workaround until
// its fixed on the Electron side.
// `node-open` is smart enough to check the `$SUDO_USER`
// environment variable and to prepend `sudo -u <user>`
// if needed.
// We keep `shell.openExternal()` for OSes other than
// Linux since we intend to fully rely on it when the
// issue is fixed, and since its closer integration with
// the operating system might lead to more accurate results
// than a third party NPM module.
//
// See https://github.com/electron/electron/issues/5039
if (os.platform() === 'linux') {
return nodeOpen(attributes.osOpenExternal);
}
electron.shell.openExternal(attributes.osOpenExternal); electron.shell.openExternal(attributes.osOpenExternal);
}); });
} }

1
package.json
View File

@ -64,7 +64,6 @@
"is-elevated": "^1.0.0", "is-elevated": "^1.0.0",
"lodash": "^4.5.1", "lodash": "^4.5.1",
"ngstorage": "^0.3.10", "ngstorage": "^0.3.10",
"open": "0.0.5",
"resin-cli-errors": "^1.2.0", "resin-cli-errors": "^1.2.0",
"resin-cli-form": "^1.4.1", "resin-cli-form": "^1.4.1",
"resin-cli-visuals": "^1.2.8", "resin-cli-visuals": "^1.2.8",