fix(plugins/plugin-bash-like): add back configurable shell

kubernetes-sigs · May 12, 2020 · 51b2270 · 51b2270
1 parent 0e3a030
commit 51b2270
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/plugins/plugin-bash-like/src/pty/server.ts b/plugins/plugin-bash-like/src/pty/server.ts
@@ -192,10 +192,14 @@ export const getLoginShell = (): Promise<string> => {
 export async function getShellOpts(): Promise<Shell> {
   const kuirc = (await import('./kuirc')).default
   const bashShellOpts = process.platform === 'win32' ? undefined : ['--rcfile', await kuirc, '-i', '-c', '--']
-  const shellOpts = process.platform === 'win32' ? [] : bashShellOpts
 
+  const { shellExe: s, shellOpts: o } = await import('@kui-shell/client/config.d/proxy.json').catch(() => {
+    return { shellExe: '', shellOpts: [] }
+  })
+  const shellExe = s || (process.platform === 'win32' ? 'powershell.exe' : '/bin/bash')
+  const shellOpts = o && Array.isArray(o) && o.length > 0 ? o : process.platform === 'win32' ? [] : bashShellOpts
   return {
-    shellExe: process.platform === 'win32' ? 'powershell.exe' : '/bin/bash',
+    shellExe,
     shellOpts
   }
 }

diff --git a/plugins/plugin-client-default/config.d/proxy.json b/plugins/plugin-client-default/config.d/proxy.json
@@ -5,5 +5,7 @@
     "needleOptions": {
       "rejectUnauthorized": false
     }
-  }
+  },
+  "shellExe": "",
+  "shellOpts": []
 }