fix: correctly identify powershell on windows (#1134)

* fix: correctly identify powershell * test: windows shell test * test: windows shell test * test: load config --------- Co-authored-by: Cristian Dominguez <cdominguez@salesforce.com>
oclif · Jul 9, 2024 · bcec7df · bcec7df
1 parent 6488568
commit bcec7df
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -663,6 +663,10 @@ export class Config implements IConfig {
     const SHELL = process.env.SHELL ?? osUserInfo().shell?.split(sep)?.pop()
     if (SHELL) {
       shellPath = SHELL.split('/')
+    } else if (this.windows && process.title.toLowerCase().includes('powershell')) {
+      shellPath = ['powershell']
+    } else if (this.windows && process.title.toLowerCase().includes('command prompt')) {
+      shellPath = ['cmd.exe']
     } else if (this.windows && COMSPEC) {
       shellPath = COMSPEC.split(/\\|\//)
     } else {

diff --git a/test/config/config.shell.test.ts b/test/config/config.shell.test.ts
@@ -4,11 +4,22 @@ import {sep} from 'node:path'
 
 import {Config} from '../../src'
 
-const getShell = () => osUserInfo().shell?.split(sep)?.pop() || 'unknown'
+const getShell = () =>
+  osUserInfo().shell?.split(sep)?.pop() || (process.platform === 'win32' ? 'powershell' : 'unknown')
 
 describe('config shell', () => {
-  it('has a default shell', () => {
-    const config = new Config({root: '/tmp'})
+  it('has a default shell', async () => {
+    const config = new Config({
+      root: '/tmp',
+      pjson: {
+        name: 'test-cli',
+        version: '0.0.1',
+        oclif: {
+          bin: 'test-cli',
+        },
+      },
+    })
+    await config.load()
     // @ts-expect-error because _shell is private
     expect(config._shell()).to.equal(getShell(), `SHELL: ${process.env.SHELL} COMSPEC: ${process.env.COMSPEC}`)
   })