From 773ddb6e9e47f4ea3ab0862dfb5706637e525b7b Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Fri, 17 Nov 2017 02:56:42 +0100
Subject: [PATCH] fix(child-writer): Pass parent env during elevation (#1851)

Change-Type: patch
---
 lib/child-writer/writer-proxy.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/child-writer/writer-proxy.js b/lib/child-writer/writer-proxy.js
index ddb25d69..6079f4a6 100644
--- a/lib/child-writer/writer-proxy.js
+++ b/lib/child-writer/writer-proxy.js
@@ -101,19 +101,21 @@ permissions.isElevated().then((elevated) => {
     // For debugging purposes
     console.log(`Running: ${commandArguments.join(' ')}`)
 
+    const commandEnv = _.assign({}, process.env, {
+      ELECTRON_RUN_AS_NODE: 1,
+      IPC_SERVER_ID: process.env.IPC_SERVER_ID,
+      IPC_CLIENT_ID: process.env.IPC_CLIENT_ID,
+
+      // This environment variable prevents the AppImages
+      // desktop integration script from presenting the
+      // "installation" dialog.
+      SKIP: 1
+
+    })
+
     return permissions.elevateCommand(commandArguments, {
       applicationName: packageJSON.displayName,
-      environment: {
-        ELECTRON_RUN_AS_NODE: 1,
-        IPC_SERVER_ID: process.env.IPC_SERVER_ID,
-        IPC_CLIENT_ID: process.env.IPC_CLIENT_ID,
-
-        // This environment variable prevents the AppImages
-        // desktop integration script from presenting the
-        // "installation" dialog.
-        SKIP: 1
-
-      }
+      environment: commandEnv
     }).then((results) => {
       if (results.cancelled) {
         process.exit(EXIT_CODES.CANCELLED)