From df24ad8741ed4ed846aa4eae8c8c5dad1877471e Mon Sep 17 00:00:00 2001
From: Wei Shen <shenwe@microsoft.com>
Date: Tue, 29 Jan 2019 09:50:13 +0800
Subject: [PATCH] avoid override process env (#353)

---
 package.json           | 2 +-
 src/common/executor.ts | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 8ab5f531..c18bdbfe 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "Develop, deploy, debug, and manage your IoT Edge solution",
-  "version": "1.9.0-rc",
+  "version": "1.9.0-rc2",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",
diff --git a/src/common/executor.ts b/src/common/executor.ts
index c543700e..483e74c5 100644
--- a/src/common/executor.ts
+++ b/src/common/executor.ts
@@ -20,7 +20,8 @@ export class Executor {
         const envVars = Executor.getEnvFromConfig();
         const options: ExecSyncOptions = { encoding: "utf8" };
         if (envVars) {
-            options.env = Executor.mergeEnvs(envVars, process.env);
+            const processEnvs = JSON.parse(JSON.stringify(process.env));
+            options.env = Executor.mergeEnvs(envVars, processEnvs);
         }
         return execSync(command, options);
     }
@@ -40,7 +41,8 @@ export class Executor {
             const envVars = Executor.getEnvFromConfig();
             if (envVars) {
                 options = options || {};
-                const processEnvs = Executor.mergeEnvs(envVars, process.env);
+                let processEnvs = JSON.parse(JSON.stringify(process.env));
+                processEnvs = Executor.mergeEnvs(envVars, processEnvs);
                 options.env = Executor.mergeEnvs(options.env, processEnvs);
             }