fix(plugins/plugin-bash-like): in browser client-server configs, env is lost in cd

Fixes #5659

Author: starpit

plugins/plugin-bash-like/src/pty/server.ts

@@ -329,7 +329,7 @@ export const onConnection = (exitNow: ExitHandler, uid?: number, gid?: number) =
           // eslint-disable-next-line no-async-promise-executor
           shells[msg.uuid] = new Promise(async (resolve, reject) => {
             try {
-              const env = Object.assign({}, msg.env || process.env, { KUI: 'true' })
+              const env = Object.assign({}, process.env, msg.env, { KUI: 'true' })
               if (process.env.DEBUG && (!msg.env || !msg.env.DEBUG)) {
                 // don't pass DEBUG unless the user asked for it!
                 delete env.DEBUG

plugins/plugin-bash-like/src/test/bash-like/export.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 IBM Corporation
+ * Copyright 2019-20 IBM Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,14 @@ describe('export command', function(this: Common.ISuite) {
   after(Common.after(this))
   Util.closeAllExceptFirstTab.bind(this)()
 
+  Common.pit(`should cd and still have a value for HOME`, () =>
+    CLI.command('cd', this.app)
+      .then(ReplExpect.okWithAny)
+      .then(() => CLI.command('pwd', this.app).then(ReplExpect.okWithPtyOutput(process.env.HOME)))
+      .then(() => CLI.command('printenv HOME', this.app).then(ReplExpect.okWithPtyOutput(process.env.HOME)))
+      .catch(Common.oops(this))
+  )
+
   Common.pit(`should fail with export without args`, () =>
     CLI.command(`export`, this.app)
       .then(ReplExpect.error(497))