fix(plugins/plugin-bash-like): kubectl prereq fails

This is due to a change in bash-like's new cwd() impl

Author: starpit

plugins/plugin-bash-like/src/lib/cmds/catchall.ts

@@ -27,6 +27,7 @@ const debug = Debug('plugins/bash-like/cmds/catchall')
  */
 export const dispatchToShell = async ({
   tab,
+  REPL,
   command,
   argv,
   argvNoOptions,
@@ -53,7 +54,7 @@ export const dispatchToShell = async ({
   const eOptions =
     useRaw || execOptions.isProxied
       ? execOptions
-      : Object.assign({ cwd: await cwd(execOptions, tab.REPL) }, { stdout: await createOutputStream() }, execOptions)
+      : Object.assign({ cwd: await cwd(execOptions, REPL) }, { stdout: await createOutputStream() }, execOptions)
 
   const actualCommand = command.replace(/^(!|sendtopty)\s+/, '')
 
@@ -75,7 +76,7 @@ export const dispatchToShell = async ({
     return response
   } else {
     const { doExec } = await import(/* webpackMode: "lazy" */ '../../pty/client')
-    const exec = () => doExec(tab, actualCommand, argvNoOptions, parsedOptions, eOptions)
+    const exec = () => doExec(tab, REPL, actualCommand, argvNoOptions, parsedOptions, eOptions)
 
     if (useRaw) {
       eOptions.quiet = true

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

@@ -25,6 +25,7 @@ import { IDisposable, Terminal as XTerminal } from 'xterm'
 import {
   Capabilities,
   Tab,
+  REPL,
   Abortable,
   FlowControllable,
   XtermResponse,
@@ -748,6 +749,7 @@ const getOrCreateChannel = async (
   cmdline: string,
   uuid: string,
   tab: Tab,
+  repl: REPL,
   execOptions: ExecOptions,
   terminal: KuiTerminal,
   initOnMessage: (ws: Channel) => void,
@@ -772,7 +774,7 @@ const getOrCreateChannel = async (
       uuid,
       rows: terminal ? terminal.rows : 80,
       cols: terminal ? terminal.cols : 40,
-      cwd: await cwd(execOptions, tab.REPL),
+      cwd: await cwd(execOptions, repl),
       env: Object.keys(env).length > 0 && env // VERY IMPORTANT: don't send an empty process.env
     }
     debug('exec after open', msg)
@@ -826,6 +828,7 @@ const getOrCreateChannel = async (
  */
 export const doExec = (
   tab: Tab,
+  repl: REPL,
   cmdline: string,
   argvNoOptions: string[],
   parsedOptions: Options,
@@ -967,18 +970,25 @@ export const doExec = (
         //
         // create a channel to the underlying node-pty
         //
-        const ws: Channel = await getOrCreateChannel(cmdline, ourUUID, tab, execOptions, terminal, init, focus).catch(
-          (err: CodedError) => {
-            if (err.code !== 503) {
-              // don't bother complaining too much about connection refused
-              console.error('error creating channel', err)
-            }
-            if (cleanUpTerminal) {
-              cleanUpTerminal()
-            }
-            throw err
+        const ws: Channel = await getOrCreateChannel(
+          cmdline,
+          ourUUID,
+          tab,
+          repl,
+          execOptions,
+          terminal,
+          init,
+          focus
+        ).catch((err: CodedError) => {
+          if (err.code !== 503) {
+            // don't bother complaining too much about connection refused
+            console.error('error creating channel', err)
+          }
+          if (cleanUpTerminal) {
+            cleanUpTerminal()
           }
-        )
+          throw err
+        })
         if (resizer) {
           resizer.ws = ws
         }

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

@@ -27,4 +27,4 @@ export const doExec = (
   argvNoOptions: string[],
   parsedOptions: Options,
   execOptions: ExecOptions
-) => import('./client').then(_ => _.doExec(tab, cmdline, argvNoOptions, parsedOptions, execOptions))
+) => import('./client').then(_ => _.doExec(tab, tab.REPL, cmdline, argvNoOptions, parsedOptions, execOptions))