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

fix(child-writer): Pass parent env during elevation (#1851)

Browse Source 
Change-Type: patch
This commit is contained in:
Jonas Hermsmeier 2017-11-17 02:56:42 +01:00 committed by GitHub
parent 7ebff68506
commit 773ddb6e9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/child-writer/writer-proxy.js
View File

@ -101,9 +101,7 @@ permissions.isElevated().then((elevated) => {
// For debugging purposes // For debugging purposes
console.log(`Running: ${commandArguments.join(' ')}`) console.log(`Running: ${commandArguments.join(' ')}`)
return permissions.elevateCommand(commandArguments, { const commandEnv = _.assign({}, process.env, {
applicationName: packageJSON.displayName,
environment: {
ELECTRON_RUN_AS_NODE: 1, ELECTRON_RUN_AS_NODE: 1,
IPC_SERVER_ID: process.env.IPC_SERVER_ID, IPC_SERVER_ID: process.env.IPC_SERVER_ID,
IPC_CLIENT_ID: process.env.IPC_CLIENT_ID, IPC_CLIENT_ID: process.env.IPC_CLIENT_ID,
@ -113,7 +111,11 @@ permissions.isElevated().then((elevated) => {
// "installation" dialog. // "installation" dialog.
SKIP: 1 SKIP: 1
} })
return permissions.elevateCommand(commandArguments, {
applicationName: packageJSON.displayName,
environment: commandEnv
}).then((results) => { }).then((results) => {
if (results.cancelled) { if (results.cancelled) {
process.exit(EXIT_CODES.CANCELLED) process.exit(EXIT_CODES.CANCELLED)