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 #2172 from resin-io/fix-inherit-env-windows

Browse Source 
fix(image-writer): Don't inherit environment on Windows
This commit is contained in:
Jonas Hermsmeier 2018-04-05 16:43:13 +02:00 committed by GitHub
commit 0d1b9641c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gui/app/modules/image-writer.js
View File

@ -173,9 +173,7 @@ exports.performWrite = (image, drives, onProgress) => {
ipc.server.on('start', () => { ipc.server.on('start', () => {
console.log(`Elevating command: ${_.join(argv, ' ')}`) console.log(`Elevating command: ${_.join(argv, ' ')}`)
permissions.elevateCommand(argv, { const env = _.assign({}, process.platform === 'win32' ? {} : process.env, {
applicationName: packageJSON.displayName,
environment: _.assign({}, process.env, {
IPC_SERVER_ID, IPC_SERVER_ID,
IPC_CLIENT_ID, IPC_CLIENT_ID,
IPC_SOCKET_ROOT: ipc.config.socketRoot, IPC_SOCKET_ROOT: ipc.config.socketRoot,
@ -187,6 +185,10 @@ exports.performWrite = (image, drives, onProgress) => {
// "installation" dialog // "installation" dialog
SKIP: 1 SKIP: 1
}) })
permissions.elevateCommand(argv, {
applicationName: packageJSON.displayName,
environment: env
}).then((results) => { }).then((results) => {
flashResults.cancelled = results.cancelled flashResults.cancelled = results.cancelled
console.log('Flash results', flashResults) console.log('Flash results', flashResults)