Merge branch 'next' into zowe-version-workflow

Signed-off-by: Amber Torrise <[email protected]>

__tests__/__packages__/cli-test-utils/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI test utils package will be documented in this file.
 
+## `8.0.0-next.202407262216`
+
+- Update: See `7.28.2` for details
+
 ## `8.0.0-next.202407021516`
 
 - BugFix: Updated dependencies for technical currency [#2188](https://github.com/zowe/zowe-cli/pull/2188)
@@ -14,6 +18,10 @@ All notable changes to the Zowe CLI test utils package will be documented in thi
 
 - Major: First major version bump for V3
 
+## `7.28.2`
+
+- BugFix: Improved the error message shown on Windows when `runCliScript` method cannot find `sh` executable on PATH. [#2208](https://github.com/zowe/zowe-cli/issues/2208)
+
 ## `7.18.11`
 
 - BugFix: Fix types error from an incorrect jstree type during compilation

__tests__/__packages__/cli-test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.0.0-next.202407232256",
+  "version": "8.0.0-next.202407262216",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/uuid": "^10.0.0",
-    "@zowe/imperative": "8.0.0-next.202407232256"
+    "@zowe/imperative": "8.0.0-next.202407262216"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0-next"

__tests__/__packages__/cli-test-utils/src/TestUtils.ts

@@ -10,7 +10,7 @@
 */
 
 import * as fs from "fs";
-import { spawnSync, SpawnSyncReturns } from "child_process";
+import { spawnSync, SpawnSyncReturns, ExecFileException } from "child_process";
 import { ITestEnvironment } from "./environment/doc/response/ITestEnvironment";
 import { CommandProfiles, ICommandDefinition, IHandlerParameters } from "@zowe/imperative";
 
@@ -37,11 +37,16 @@ export function runCliScript(scriptPath: string, testEnvironment: ITestEnvironme
 
         if (process.platform === "win32") {
             // Execute the command synchronously
-            return spawnSync("sh", [`${scriptPath}`].concat(args), {
+            const response = spawnSync("sh", [scriptPath].concat(args), {
                 cwd: testEnvironment.workingDir,
-                env: childEnv,
-                encoding: "buffer"
+                encoding: "buffer",
+                env: childEnv
             });
+            if ((response.error as ExecFileException)?.code === "ENOENT") {
+                throw new Error(`"sh" is missing from your PATH. Check that Git Bash is installed with the option to ` +
+                    `"Use Git and Unix Tools from Windows Command Prompt".`);
+            }
+            return response;
         }
 
         // Check to see if the file is executable

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0-next.202407232256",
+  "version": "8.0.0-next.202407262216",
   "command": {
     "publish": {
       "ignoreChanges": [