@oclif/core 4.11.4 → 4.11.5

package/lib/config/config.d.ts

@@ -50,7 +50,6 @@ export declare class Config implements IConfig {
     static get rootPlugin(): IPlugin | undefined;
     get topics(): Topic[];
     get versionDetails(): VersionDetails;
-    protected _shell(): string;
     protected dir(category: 'cache' | 'config' | 'data'): string;
     findCommand(id: string, opts: {
         must: true;

package/lib/config/config.js

@@ -195,29 +195,6 @@ class Config {
             shell: this.shell,
         };
     }
-    _shell() {
-        let shellPath;
-        const { COMSPEC } = process.env;
-        const SHELL = process.env.SHELL ?? (0, node_os_1.userInfo)().shell?.split(node_path_1.sep)?.pop();
-        if (SHELL) {
-            shellPath = SHELL.split('/');
-        }
-        else if (this.windows &&
-            (process.title.toLowerCase().includes('powershell') || process.title.toLowerCase().includes('pwsh'))) {
-            shellPath = ['powershell'];
-        }
-        else if (this.windows &&
-            (process.title.toLowerCase().includes('command prompt') || process.title.toLowerCase().includes('cmd'))) {
-            shellPath = ['cmd.exe'];
-        }
-        else if (this.windows && COMSPEC) {
-            shellPath = COMSPEC.split(/\\|\//);
-        }
-        else {
-            shellPath = ['unknown'];
-        }
-        return shellPath.at(-1) ?? 'unknown';
-    }
     dir(category) {
         const base = process.env[`XDG_${category.toUpperCase()}_HOME`] ||
             (this.windows && process.env.LOCALAPPDATA) ||
@@ -327,7 +304,7 @@ class Config {
         if (this.platform === 'win32')
             this.dirname = this.dirname.replace('/', '\\');
         this.userAgent = `${this.name}/${this.version} ${this.platform}-${this.arch} node-${process.version}`;
-        this.shell = this._shell();
+        this.shell = (0, os_1.getShell)();
         this.home = process.env.HOME || (this.windows && this.windowsHome()) || (0, os_1.getHomeDir)() || (0, node_os_1.tmpdir)();
         this.cacheDir = this.scopedEnvVar('CACHE_DIR') || this.macosCacheDir() || this.dir('cache');
         this.configDir = this.scopedEnvVar('CONFIG_DIR') || this.dir('config');

package/lib/util/os.d.ts

@@ -16,3 +16,4 @@ export declare function getHomeDir(): string;
  * @returns The process' platform
  */
 export declare function getPlatform(): 'wsl' | NodeJS.Platform;
+export declare function getShell(): string;

package/lib/util/os.js

@@ -5,8 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHomeDir = getHomeDir;
 exports.getPlatform = getPlatform;
+exports.getShell = getShell;
 const is_wsl_1 = __importDefault(require("is-wsl"));
+const node_child_process_1 = require("node:child_process");
 const node_os_1 = require("node:os");
+const node_path_1 = __importDefault(require("node:path"));
 /**
  * Call os.homedir() and return the result
  *
@@ -29,3 +32,28 @@ function getHomeDir() {
 function getPlatform() {
     return is_wsl_1.default ? 'wsl' : (0, node_os_1.platform)();
 }
+function getShell() {
+    let shellPath;
+    const SHELL = process.env.SHELL ?? (0, node_os_1.userInfo)().shell?.split(node_path_1.default.sep)?.pop();
+    if (SHELL) {
+        shellPath = SHELL.split('/');
+    }
+    else if (getPlatform() === 'win32') {
+        shellPath = determineWindowsShell().split(node_path_1.default.sep);
+    }
+    else {
+        shellPath = ['unknown'];
+    }
+    return shellPath.at(-1) ?? 'unknown';
+}
+function determineWindowsShell() {
+    try {
+        const parentProcessName = (0, node_child_process_1.execSync)(`powershell.exe -NoProfile -Command "(Get-CimInstance Win32_Process -Filter 'ProcessID = ${process.ppid}').Name"`, { encoding: 'utf8' });
+        return parentProcessName.includes('powershell') || parentProcessName.includes('pwsh')
+            ? 'powershell'
+            : (process.env.COMSPEC ?? 'cmd.exe');
+    }
+    catch {
+        return process.env.COMSPEC ?? 'cmd.exe';
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.11.4",
+  "version": "4.11.5",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {