From 85bc08bb08a52af5fa0e71b607799ca61f18fbd6 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 15:25:35 -0500
Subject: [PATCH 01/15] Update .errors

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/.errors | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/commands/support/verify-fingerprints/.errors b/bin/commands/support/verify-fingerprints/.errors
index 94f583e48c..51be307b71 100644
--- a/bin/commands/support/verify-fingerprints/.errors
+++ b/bin/commands/support/verify-fingerprints/.errors
@@ -1,5 +1,5 @@
 ZWEL0113E|113|Failed to find Zowe version. Please validate your Zowe directory.
 ZWEL0122E|122|Cannot find java. Please define JAVA_HOME environment variable.
-ZWEL0150E|150|Failed to find file %s. Zowe runtimeDirectory is invalid.
-ZWEL0151E|151|Failed to create temporary file %s. Please check permission or volume free space.
+ZWEL0150E|150|Failed to find file "%s". Zowe runtimeDirectory is invalid.
+ZWEL0151E|151|Failed to create temporary file "%s". Please check permission or volume free space.
 ZWEL0181E|181|Failed to verify Zowe file fingerprints.

From 233d7cf633c73cacfc8a7d0b9a3d04aa68db5fb5 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 15:26:17 -0500
Subject: [PATCH 02/15] Update .errors

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/init/stc/.errors | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/commands/init/stc/.errors b/bin/commands/init/stc/.errors
index 4109f9bdf2..726b62d927 100644
--- a/bin/commands/init/stc/.errors
+++ b/bin/commands/init/stc/.errors
@@ -1,7 +1,7 @@
 ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file.
 ZWEL0300W||%s already exists. This data set member will be overwritten during configuration.
 ZWEL0301W||%s already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.
-ZWEL0143E|143|Cannot find data set member %s. You may need to re-run `zwe install`.
+ZWEL0143E|143|%s.%s(%s) already exists. This data set member will be overwritten during configuration.
 ZWEL0158E|158|%s already exists.
 ZWEL0159E|159|Failed to modify %s.
 ZWEL0160E|160|Failed to write to %s. Please check if target data set is opened by others.

From 46a79c495a5623f3022c20b6b3c6fbf6be262519 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 15:26:44 -0500
Subject: [PATCH 03/15] Update index.ts

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/index.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/commands/support/verify-fingerprints/index.ts b/bin/commands/support/verify-fingerprints/index.ts
index 10ee46af5c..9b2e450a54 100644
--- a/bin/commands/support/verify-fingerprints/index.ts
+++ b/bin/commands/support/verify-fingerprints/index.ts
@@ -57,7 +57,8 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
   if (fs.fileExists(manifest)) {
       manifestContent = xplatform.loadFileUTF8(manifest, xplatform.AUTO_DETECT);
   } else {
-      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${manifest}". Zowe runtimeDirectory is invalid.`, undefined, 150);
+      let missingFile = manifest;
+      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${missingFile}". Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
   if (manifestContent) {
       manifestJson = JSON.parse(manifestContent);
@@ -68,11 +69,13 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
   const zoweVersion = manifestJson.version;
 
   if (!fs.fileExists(`${zoweRuntime}/bin/utils/HashFiles.class`)) {
-      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${zoweRuntime}/bin/utils/HashFiles.class". Zowe runtimeDirectory is invalid.`, undefined, 150);
+      let missingFile = `${zoweRuntime}/bin/utils/HashFiles.class`;
+      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${missingFile}". Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
 
   if (!fs.fileExists(`${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt`)) {
-      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt". Zowe runtimeDirectory is invalid.`, undefined, 150);
+      let missingFile = `${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
+      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${missingFile}". Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
 
   common.printMessage('- Create Zowe directory file list');
@@ -91,7 +94,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
   const javaHash = shell.execOutSync('sh', '-c', `cd '${zoweRuntime}' && '${javaHome}/bin/java' -cp '${zoweRuntime}/bin/utils/' HashFiles '${allFiles}' | sort > '${customHashes}'`);
 
   if (javaHash.rc != 0 || !fs.fileExists(customHashes) || fs.fileSize(customHashes) < 1) {
-    common.printError(`  * Error ZWEL0151E: Failed to create temporary file ${customHashes}. Please check permission or volume free space.`);
+    common.printError(`  * Error ZWEL0151E: Failed to create temporary file "${customHashes}". Please check permission or volume free space.`);
     common.printError(`  * Exit code: java error code=${javaHash.rc}`)
     common.printError(`  *            file exists=${fs.fileExists(customHashes)}`);
     if (fs.fileExists(customHashes)) {

From a07fb97df579ade0910ff67e9060b3ec0c0628c8 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 15:36:54 -0500
Subject: [PATCH 04/15] Update index.ts

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/commands/support/verify-fingerprints/index.ts b/bin/commands/support/verify-fingerprints/index.ts
index 9b2e450a54..f1b7c09cfa 100644
--- a/bin/commands/support/verify-fingerprints/index.ts
+++ b/bin/commands/support/verify-fingerprints/index.ts
@@ -58,7 +58,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
       manifestContent = xplatform.loadFileUTF8(manifest, xplatform.AUTO_DETECT);
   } else {
       let missingFile = manifest;
-      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${missingFile}". Zowe runtimeDirectory is invalid.`, undefined, 150);
+      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file ${missingFile}. Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
   if (manifestContent) {
       manifestJson = JSON.parse(manifestContent);
@@ -70,12 +70,12 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
 
   if (!fs.fileExists(`${zoweRuntime}/bin/utils/HashFiles.class`)) {
       let missingFile = `${zoweRuntime}/bin/utils/HashFiles.class`;
-      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${missingFile}". Zowe runtimeDirectory is invalid.`, undefined, 150);
+      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file ${missingFile}. Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
 
   if (!fs.fileExists(`${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt`)) {
       let missingFile = `${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
-      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file "${missingFile}". Zowe runtimeDirectory is invalid.`, undefined, 150);
+      common.printErrorAndExit(`Error ZWEL0150E: Failed to find file ${missingFile}. Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
 
   common.printMessage('- Create Zowe directory file list');

From 0c0a1041a26abcd0a29cfa89490422031cbafc2e Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 15:37:11 -0500
Subject: [PATCH 05/15] Update .errors

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/.errors | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/commands/support/verify-fingerprints/.errors b/bin/commands/support/verify-fingerprints/.errors
index 51be307b71..9deeaa9695 100644
--- a/bin/commands/support/verify-fingerprints/.errors
+++ b/bin/commands/support/verify-fingerprints/.errors
@@ -1,5 +1,5 @@
 ZWEL0113E|113|Failed to find Zowe version. Please validate your Zowe directory.
 ZWEL0122E|122|Cannot find java. Please define JAVA_HOME environment variable.
-ZWEL0150E|150|Failed to find file "%s". Zowe runtimeDirectory is invalid.
+ZWEL0150E|150|Failed to find file %s. Zowe runtimeDirectory is invalid.
 ZWEL0151E|151|Failed to create temporary file "%s". Please check permission or volume free space.
 ZWEL0181E|181|Failed to verify Zowe file fingerprints.

From 430ac9e850a911549c532a409f1b9c573fc71aaa Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 15:43:08 -0500
Subject: [PATCH 06/15] Update .errors

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/.errors | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/commands/support/verify-fingerprints/.errors b/bin/commands/support/verify-fingerprints/.errors
index 9deeaa9695..ee19b70465 100644
--- a/bin/commands/support/verify-fingerprints/.errors
+++ b/bin/commands/support/verify-fingerprints/.errors
@@ -1,5 +1,6 @@
 ZWEL0113E|113|Failed to find Zowe version. Please validate your Zowe directory.
 ZWEL0122E|122|Cannot find java. Please define JAVA_HOME environment variable.
 ZWEL0150E|150|Failed to find file %s. Zowe runtimeDirectory is invalid.
-ZWEL0151E|151|Failed to create temporary file "%s". Please check permission or volume free space.
+ZWEL0151E|151|Failed to create temporary file %s. Please check permission or volume free space.
 ZWEL0181E|181|Failed to verify Zowe file fingerprints.
+ZWEL0318E|318|Failed to compare hashes of %s and current.

From 72aa5886f7ba3de88ae912ba849bb0b38cfbc2fe Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 15:45:20 -0500
Subject: [PATCH 07/15] Update index.ts

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/commands/support/verify-fingerprints/index.ts b/bin/commands/support/verify-fingerprints/index.ts
index f1b7c09cfa..deb1f2d911 100644
--- a/bin/commands/support/verify-fingerprints/index.ts
+++ b/bin/commands/support/verify-fingerprints/index.ts
@@ -82,7 +82,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
   const allFiles = fs.createTmpFile(tmpFilePrefix);
   shell.execOutSync('sh', '-c', `cd '${zoweRuntime}' && find . -name ./SMPE -prune -o -name "./ZWE*" -prune -o -name ./fingerprint -prune -o -type f -print > "${allFiles}"`);
   if (!fs.fileExists(allFiles)) {
-    common.printErrorAndExit(`Error ZWEL0151E: Failed to create temporary file "${allFiles}". Please check permission or volume free space.`, undefined, 151);
+    common.printErrorAndExit(`Error ZWEL0151E: Failed to create temporary file ${allFiles}. Please check permission or volume free space.`, undefined, 151);
   }
 
   common.printDebug(`  * File list created as ${allFiles}`);
@@ -94,7 +94,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
   const javaHash = shell.execOutSync('sh', '-c', `cd '${zoweRuntime}' && '${javaHome}/bin/java' -cp '${zoweRuntime}/bin/utils/' HashFiles '${allFiles}' | sort > '${customHashes}'`);
 
   if (javaHash.rc != 0 || !fs.fileExists(customHashes) || fs.fileSize(customHashes) < 1) {
-    common.printError(`  * Error ZWEL0151E: Failed to create temporary file "${customHashes}". Please check permission or volume free space.`);
+    common.printError(`  * Error ZWEL0151E: Failed to create temporary file ${customHashes}. Please check permission or volume free space.`);
     common.printError(`  * Exit code: java error code=${javaHash.rc}`)
     common.printError(`  *            file exists=${fs.fileExists(customHashes)}`);
     if (fs.fileExists(customHashes)) {
@@ -125,7 +125,8 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
     common.printMessage(`- Find ${commStepName} files`);
     const commResult = shell.execOutSync('sh', '-c', `cd '${zoweRuntime}' && comm -${commParameter} "${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt" "${customHashes}"`);
     if (commResult.rc) {
-      common.printError(`  * Error ZWEL0151E: Failed to compare hashes of fingerprint/RefRuntimeHash-${zoweVersion}.txt and current.`);
+      let hashFile = `fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
+      common.printError(`  * Error ZWEL0318E: Failed to compare hashes of ${hashFile} and current.`);
       common.printError(`  * Exit code: ${commResult.rc}`);
       if (commResult.out) {
         common.printError(`  * Output:`);

From 19d7b3e8a8fb05058f42b751d65cc812bdea238c Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 16:05:25 -0500
Subject: [PATCH 08/15] Update .errors

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/start/.errors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/commands/start/.errors b/bin/commands/start/.errors
index 66fef644f0..4e94f95f45 100644
--- a/bin/commands/start/.errors
+++ b/bin/commands/start/.errors
@@ -1 +1,2 @@
+ZWEL0064E|64|failed to run command os.pipe - Cannot start component %
 ZWEL0165E|165|Failed to start job %s: %s.

From 79ad3878e6938641d15f503a61eed2c5b9bcbdcb Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 16:06:37 -0500
Subject: [PATCH 09/15] Update .errors

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/.errors | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/commands/support/verify-fingerprints/.errors b/bin/commands/support/verify-fingerprints/.errors
index ee19b70465..ee78497a4a 100644
--- a/bin/commands/support/verify-fingerprints/.errors
+++ b/bin/commands/support/verify-fingerprints/.errors
@@ -3,4 +3,4 @@ ZWEL0122E|122|Cannot find java. Please define JAVA_HOME environment variable.
 ZWEL0150E|150|Failed to find file %s. Zowe runtimeDirectory is invalid.
 ZWEL0151E|151|Failed to create temporary file %s. Please check permission or volume free space.
 ZWEL0181E|181|Failed to verify Zowe file fingerprints.
-ZWEL0318E|318|Failed to compare hashes of %s and current.
+ZWEL0319E|319|Failed to compare hashes of %s and current.

From 5bd8dd92e0cfca179a81e70992ce943a4c96b1cf Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 18 Feb 2025 16:06:48 -0500
Subject: [PATCH 10/15] Update index.ts

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/support/verify-fingerprints/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/commands/support/verify-fingerprints/index.ts b/bin/commands/support/verify-fingerprints/index.ts
index deb1f2d911..c1d14f4735 100644
--- a/bin/commands/support/verify-fingerprints/index.ts
+++ b/bin/commands/support/verify-fingerprints/index.ts
@@ -126,7 +126,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
     const commResult = shell.execOutSync('sh', '-c', `cd '${zoweRuntime}' && comm -${commParameter} "${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt" "${customHashes}"`);
     if (commResult.rc) {
       let hashFile = `fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
-      common.printError(`  * Error ZWEL0318E: Failed to compare hashes of ${hashFile} and current.`);
+      common.printError(`  * Error ZWEL0319E: Failed to compare hashes of ${hashFile} and current.`);
       common.printError(`  * Exit code: ${commResult.rc}`);
       if (commResult.out) {
         common.printError(`  * Output:`);

From 5e06a4966454e02b9d9680291c056f0b0144fe6a Mon Sep 17 00:00:00 2001
From: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
Date: Wed, 19 Feb 2025 08:26:35 +0100
Subject: [PATCH 11/15] Use const instead of let

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
---
 bin/commands/support/verify-fingerprints/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/commands/support/verify-fingerprints/index.ts b/bin/commands/support/verify-fingerprints/index.ts
index c1d14f4735..0e9cc979cc 100644
--- a/bin/commands/support/verify-fingerprints/index.ts
+++ b/bin/commands/support/verify-fingerprints/index.ts
@@ -57,7 +57,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
   if (fs.fileExists(manifest)) {
       manifestContent = xplatform.loadFileUTF8(manifest, xplatform.AUTO_DETECT);
   } else {
-      let missingFile = manifest;
+      const missingFile = manifest;
       common.printErrorAndExit(`Error ZWEL0150E: Failed to find file ${missingFile}. Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
   if (manifestContent) {
@@ -69,12 +69,12 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
   const zoweVersion = manifestJson.version;
 
   if (!fs.fileExists(`${zoweRuntime}/bin/utils/HashFiles.class`)) {
-      let missingFile = `${zoweRuntime}/bin/utils/HashFiles.class`;
+      const missingFile = `${zoweRuntime}/bin/utils/HashFiles.class`;
       common.printErrorAndExit(`Error ZWEL0150E: Failed to find file ${missingFile}. Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
 
   if (!fs.fileExists(`${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt`)) {
-      let missingFile = `${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
+      const missingFile = `${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
       common.printErrorAndExit(`Error ZWEL0150E: Failed to find file ${missingFile}. Zowe runtimeDirectory is invalid.`, undefined, 150);
   }
 
@@ -125,7 +125,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
     common.printMessage(`- Find ${commStepName} files`);
     const commResult = shell.execOutSync('sh', '-c', `cd '${zoweRuntime}' && comm -${commParameter} "${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt" "${customHashes}"`);
     if (commResult.rc) {
-      let hashFile = `fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
+      const hashFile = `fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
       common.printError(`  * Error ZWEL0319E: Failed to compare hashes of ${hashFile} and current.`);
       common.printError(`  * Exit code: ${commResult.rc}`);
       if (commResult.out) {

From 9c13dda7ae0cb581f4596fdfea2f74a1142a2faf Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Wed, 19 Feb 2025 13:51:11 -0500
Subject: [PATCH 12/15] Update messages 301, 300, 319, 320, and remove some use
 of 316 due to v3 not supporting configmgr=false

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/certificate/pkcs12/create/ca/.errors |  2 +-
 bin/commands/components/search/index.sh           | 13 ++++---------
 bin/commands/components/uninstall/.errors         |  1 -
 bin/commands/components/uninstall/index.sh        | 13 ++++---------
 bin/commands/components/upgrade/index.sh          | 13 ++++---------
 bin/commands/init/mvs/.errors                     |  2 +-
 bin/commands/init/mvs/index.sh                    |  2 +-
 bin/commands/init/vsam/.errors                    |  4 ++--
 bin/commands/init/vsam/index.sh                   |  4 ++--
 bin/commands/install/.errors                      |  2 +-
 bin/commands/install/index.sh                     |  2 +-
 bin/commands/support/verify-fingerprints/.errors  |  2 +-
 bin/commands/support/verify-fingerprints/index.ts |  2 +-
 13 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/bin/commands/certificate/pkcs12/create/ca/.errors b/bin/commands/certificate/pkcs12/create/ca/.errors
index 17d8a7cf1e..cb31b441ed 100644
--- a/bin/commands/certificate/pkcs12/create/ca/.errors
+++ b/bin/commands/certificate/pkcs12/create/ca/.errors
@@ -1,3 +1,3 @@
-ZWEL0300W||%s already exists. This %s will be overwritten during configuration.
+ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0158E|158|%s already exists.
 ZWEL0168E|168|Failed to create certificate authority %s.
diff --git a/bin/commands/components/search/index.sh b/bin/commands/components/search/index.sh
index bd125ea92a..dd2e8d5fbb 100644
--- a/bin/commands/components/search/index.sh
+++ b/bin/commands/components/search/index.sh
@@ -11,14 +11,9 @@
 # Copyright Contributors to the Zowe Project.
 #######################################################################
 
-USE_CONFIGMGR=$(check_configmgr_enabled)
-if [ "${USE_CONFIGMGR}" = "true" ]; then
-  if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
-    # user-facing command, use tmpdir to not mess up workspace permissions
-    export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
-  fi
-  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/components/search/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
+  # user-facing command, use tmpdir to not mess up workspace permissions
+  export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
 fi
+_CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/components/search/cli.js"
 
diff --git a/bin/commands/components/uninstall/.errors b/bin/commands/components/uninstall/.errors
index 5480f8fe7f..d9a3aed2a2 100644
--- a/bin/commands/components/uninstall/.errors
+++ b/bin/commands/components/uninstall/.errors
@@ -3,4 +3,3 @@ ZWEL0307E|307|Component %s cannot be uninstalled, because it is a core component
 ZWEL0308W|308|Component directory %s could not be removed, rc=%s.
 ZWEL0309W|309|Skipping removal of component %s because it is a core component.
 ZWEL0312W|312|Component %s marked for removal but is not installed.
-ZWEL????E|???|Command requires zowe.useConfigmgr=true to use.
\ No newline at end of file
diff --git a/bin/commands/components/uninstall/index.sh b/bin/commands/components/uninstall/index.sh
index 48d55e9659..757ad042c9 100644
--- a/bin/commands/components/uninstall/index.sh
+++ b/bin/commands/components/uninstall/index.sh
@@ -11,13 +11,8 @@
 # Copyright Contributors to the Zowe Project.
 #######################################################################
 
-USE_CONFIGMGR=$(check_configmgr_enabled)
-if [ "${USE_CONFIGMGR}" = "true" ]; then
-  if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
-    # user-facing command, use tmpdir to not mess up workspace permissions
-    export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
-  fi
-  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/components/uninstall/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
+  # user-facing command, use tmpdir to not mess up workspace permissions
+  export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
 fi
+_CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/components/uninstall/cli.js"
diff --git a/bin/commands/components/upgrade/index.sh b/bin/commands/components/upgrade/index.sh
index 12d8c96be5..a423ea8586 100644
--- a/bin/commands/components/upgrade/index.sh
+++ b/bin/commands/components/upgrade/index.sh
@@ -11,13 +11,8 @@
 # Copyright Contributors to the Zowe Project.
 #######################################################################
 
-USE_CONFIGMGR=$(check_configmgr_enabled)
-if [ "${USE_CONFIGMGR}" = "true" ]; then
-  if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
-    # user-facing command, use tmpdir to not mess up workspace permissions
-    export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
-  fi
-  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/components/upgrade/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
+  # user-facing command, use tmpdir to not mess up workspace permissions
+  export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
 fi
+_CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/components/upgrade/cli.js"
diff --git a/bin/commands/init/mvs/.errors b/bin/commands/init/mvs/.errors
index e0d97a80c7..2c24ea771f 100644
--- a/bin/commands/init/mvs/.errors
+++ b/bin/commands/init/mvs/.errors
@@ -1,4 +1,4 @@
 ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file.
-ZWEL0300W||%s already exists. This data set member will be overwritten during configuration.
+ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0301W||%s already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.
 ZWEL0158E|158|%s already exists.
diff --git a/bin/commands/init/mvs/index.sh b/bin/commands/init/mvs/index.sh
index ab724fa206..2768786280 100644
--- a/bin/commands/init/mvs/index.sh
+++ b/bin/commands/init/mvs/index.sh
@@ -53,7 +53,7 @@ while read -r line; do
   if [ "${ds_existence}" = "true" ]; then
     if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
       # warning
-      print_message "Warning ZWEL0300W: ${ds} already exists. Members in this data set will be overwritten."
+      print_message "Warning ZWEL0300W: ${ds} already exists. This dataset will be overwritten."
     else
       # print_error_and_exit "Error ZWEL0158E: ${ds} already exists." "" 158
       # warning
diff --git a/bin/commands/init/vsam/.errors b/bin/commands/init/vsam/.errors
index fdbb5ac7a1..291b43c8b6 100644
--- a/bin/commands/init/vsam/.errors
+++ b/bin/commands/init/vsam/.errors
@@ -1,5 +1,5 @@
 ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file.
-ZWEL0300W||%s already exists. This data set member will be overwritten during configuration.
+ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0301W||%s already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.
 ZWEL0158E|158|%s already exists.
 ZWEL0159E|159|Failed to modify %s.
@@ -7,4 +7,4 @@ ZWEL0160E|160|Failed to write to %s. Please check if target data set is opened b
 ZWEL0161E|161|Failed to run JCL %s.
 ZWEL0162E|162|Failed to find job %s result.
 ZWEL0163E|163|Job %s ends with code %s.
-ZWEL0301W|0|Zowe Caching Service is not configured to use VSAM. Command skipped.
+ZWEL0321W|0|Zowe Caching Service is not configured to use VSAM. Command skipped.
diff --git a/bin/commands/init/vsam/index.sh b/bin/commands/init/vsam/index.sh
index e279ff07b7..22c45a0081 100644
--- a/bin/commands/init/vsam/index.sh
+++ b/bin/commands/init/vsam/index.sh
@@ -22,7 +22,7 @@ require_zowe_yaml "skipnode"
 
 caching_storage=$(read_yaml_configmgr "${ZWE_CLI_PARAMETER_CONFIG}" ".components.caching-service.storage.mode" | upper_case)
 if [ "${caching_storage}" != "VSAM" ]; then
-  print_error "Warning ZWEL0301W: Zowe Caching Service is not configured to use VSAM. Command skipped."
+  print_error "Warning ZWEL0321W: Zowe Caching Service is not configured to use VSAM. Command skipped."
   return 0
 fi
 
@@ -63,7 +63,7 @@ jcl_existence=$(is_data_set_exists "${jcllib}(ZWECSVSM)")
 if [ "${jcl_existence}" = "true" ]; then
   if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
     # warning
-    print_message "Warning ZWEL0300W: ${jcllib}(ZWECSVSM) already exists. This data set member will be overwritten during configuration."
+    print_message "Warning ZWEL0300W: ${jcllib}(ZWECSVSM) already exists. This member will be overwritten."
   else
     # print_error_and_exit "Error ZWEL0158E: ${jcllib}(ZWECSVSM) already exists." "" 158
     # warning
diff --git a/bin/commands/install/.errors b/bin/commands/install/.errors
index ac03c0106d..2c24ea771f 100644
--- a/bin/commands/install/.errors
+++ b/bin/commands/install/.errors
@@ -1,4 +1,4 @@
 ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file.
-ZWEL0300W||%s already exists. Members in this data set will be overwritten.
+ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0301W||%s already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.
 ZWEL0158E|158|%s already exists.
diff --git a/bin/commands/install/index.sh b/bin/commands/install/index.sh
index 05a0455e6d..58624ae99f 100644
--- a/bin/commands/install/index.sh
+++ b/bin/commands/install/index.sh
@@ -48,7 +48,7 @@ while read -r line; do
   if [ "${ds_existence}" = "true" ]; then
     if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
       # warning
-      print_message "Warning ZWEL0300W: ${prefix}.${ds} already exists. Members in this data set will be overwritten."
+      print_message "Warning ZWEL0300W: ${prefix}.${ds} already exists. This dataset will be overwritten."
     else
       # print_error_and_exit "Error ZWEL0158E: ${prefix}.${ds} already exists." "" 158
       # warning
diff --git a/bin/commands/support/verify-fingerprints/.errors b/bin/commands/support/verify-fingerprints/.errors
index ee78497a4a..73f3271a36 100644
--- a/bin/commands/support/verify-fingerprints/.errors
+++ b/bin/commands/support/verify-fingerprints/.errors
@@ -3,4 +3,4 @@ ZWEL0122E|122|Cannot find java. Please define JAVA_HOME environment variable.
 ZWEL0150E|150|Failed to find file %s. Zowe runtimeDirectory is invalid.
 ZWEL0151E|151|Failed to create temporary file %s. Please check permission or volume free space.
 ZWEL0181E|181|Failed to verify Zowe file fingerprints.
-ZWEL0319E|319|Failed to compare hashes of %s and current.
+ZWEL0320E|320|Failed to compare hashes of %s and current.
diff --git a/bin/commands/support/verify-fingerprints/index.ts b/bin/commands/support/verify-fingerprints/index.ts
index 0e9cc979cc..0e73d7dd63 100644
--- a/bin/commands/support/verify-fingerprints/index.ts
+++ b/bin/commands/support/verify-fingerprints/index.ts
@@ -126,7 +126,7 @@ export function execute(doNotExit: Boolean, javaHome: string): void {
     const commResult = shell.execOutSync('sh', '-c', `cd '${zoweRuntime}' && comm -${commParameter} "${zoweRuntime}/fingerprint/RefRuntimeHash-${zoweVersion}.txt" "${customHashes}"`);
     if (commResult.rc) {
       const hashFile = `fingerprint/RefRuntimeHash-${zoweVersion}.txt`;
-      common.printError(`  * Error ZWEL0319E: Failed to compare hashes of ${hashFile} and current.`);
+      common.printError(`  * Error ZWEL0320E: Failed to compare hashes of ${hashFile} and current.`);
       common.printError(`  * Exit code: ${commResult.rc}`);
       if (commResult.out) {
         common.printError(`  * Output:`);

From 448084edb5bbe1591ace5e237e23631543b46753 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Wed, 19 Feb 2025 13:54:22 -0500
Subject: [PATCH 13/15] Fix 300w conflicts, remove 316e as it is no longer
 needed

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/.errors                                 | 1 -
 bin/commands/certificate/pkcs12/create/cert/.errors  | 2 +-
 bin/commands/certificate/pkcs12/create/cert/index.sh | 2 +-
 bin/commands/init/stc/.errors                        | 2 +-
 bin/commands/init/stc/index.sh                       | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/commands/.errors b/bin/commands/.errors
index b41af191c9..94e58c876d 100644
--- a/bin/commands/.errors
+++ b/bin/commands/.errors
@@ -32,5 +32,4 @@ ZWEL0200E||Failed to copy USS file %s to MVS data set %s.
 ZWEL0201E||File %s does not exist.
 ZWEL0202E||Unable to find samplib key for %s.
 ZWEL0203E||Env value in key-value pair %s has not been defined.
-ZWEL0316E||Command requires zowe.useConfigmgr=true to use.
 ZWEL0319E||NodeJS required but not found. Errors such as ZWEL0157E may occur as a result. The value 'node.home' in the Zowe YAML is not correct. 
diff --git a/bin/commands/certificate/pkcs12/create/cert/.errors b/bin/commands/certificate/pkcs12/create/cert/.errors
index ed0265e0fe..022193733b 100644
--- a/bin/commands/certificate/pkcs12/create/cert/.errors
+++ b/bin/commands/certificate/pkcs12/create/cert/.errors
@@ -1,3 +1,3 @@
-ZWEL0300W||%s already exists. This %s will be overwritten during configuration.
+ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0158E|158|%s already exists.
 ZWEL0169E|169|Failed to create certificate "%s".
diff --git a/bin/commands/certificate/pkcs12/create/cert/index.sh b/bin/commands/certificate/pkcs12/create/cert/index.sh
index d7bdf4e7fe..77ff6bc9e9 100644
--- a/bin/commands/certificate/pkcs12/create/cert/index.sh
+++ b/bin/commands/certificate/pkcs12/create/cert/index.sh
@@ -22,7 +22,7 @@ keystore="${ZWE_CLI_PARAMETER_KEYSTORE_DIR}/${ZWE_CLI_PARAMETER_KEYSTORE}/${ZWE_
 if [ -f "${keystore}" ]; then
   if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
     # warning
-    print_message "Warning ZWEL0300W: Keystore \"${keystore}\" already exists. This keystore will be overwritten during configuration."
+    print_message "Warning ZWEL0300W: Keystore \"${keystore}\" already exists. This keystore will be overwritten."
     rm -fr "${ZWE_CLI_PARAMETER_KEYSTORE_DIR}/${ZWE_CLI_PARAMETER_KEYSTORE}"
   else
     # error
diff --git a/bin/commands/init/stc/.errors b/bin/commands/init/stc/.errors
index 726b62d927..453eff3cf0 100644
--- a/bin/commands/init/stc/.errors
+++ b/bin/commands/init/stc/.errors
@@ -1,5 +1,5 @@
 ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file.
-ZWEL0300W||%s already exists. This data set member will be overwritten during configuration.
+ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0301W||%s already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.
 ZWEL0143E|143|%s.%s(%s) already exists. This data set member will be overwritten during configuration.
 ZWEL0158E|158|%s already exists.
diff --git a/bin/commands/init/stc/index.sh b/bin/commands/init/stc/index.sh
index f3de7377e9..ec74a30585 100644
--- a/bin/commands/init/stc/index.sh
+++ b/bin/commands/init/stc/index.sh
@@ -79,7 +79,7 @@ for mb in ${target_proclibs}; do
   if [ "${jcl_existence}" = "true" ]; then
     if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
       # warning
-      print_message "Warning ZWEL0300W: ${jcllib}(${mb}) already exists. This data set member will be overwritten during configuration."
+      print_message "Warning ZWEL0300W: ${jcllib}(${mb}) already exists. This member will be overwritten."
     else
       # print_error_and_exit "Error ZWEL0158E: ${jcllib}(${mb}) already exists." "" 158
       # warning

From da2af6b19a7521fd63ee43ae46c474460added12 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Wed, 19 Feb 2025 13:59:03 -0500
Subject: [PATCH 14/15] Fix more 300w

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/certificate/pkcs12/create/ca/index.sh | 2 +-
 bin/commands/init/certificate/.errors              | 1 +
 bin/commands/init/certificate/index.sh             | 2 +-
 bin/commands/init/stc/index.sh                     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/commands/certificate/pkcs12/create/ca/index.sh b/bin/commands/certificate/pkcs12/create/ca/index.sh
index da371ffb67..6ff3c7384a 100644
--- a/bin/commands/certificate/pkcs12/create/ca/index.sh
+++ b/bin/commands/certificate/pkcs12/create/ca/index.sh
@@ -22,7 +22,7 @@ keystore="${ZWE_CLI_PARAMETER_KEYSTORE_DIR}/${ZWE_CLI_PARAMETER_ALIAS}/${ZWE_CLI
 if [ -f "${keystore}" ]; then
   if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
     # warning
-    print_message "Warning ZWEL0300W: Keystore \"${keystore}\" already exists. This keystore will be overwritten during configuration."
+    print_message "Warning ZWEL0300W: Keystore \"${keystore}\" already exists. This keystore will be overwritten."
     rm -fr "${ZWE_CLI_PARAMETER_KEYSTORE_DIR}/${ZWE_CLI_PARAMETER_ALIAS}"
   else
     # error
diff --git a/bin/commands/init/certificate/.errors b/bin/commands/init/certificate/.errors
index 070225e19e..cc4c23823b 100644
--- a/bin/commands/init/certificate/.errors
+++ b/bin/commands/init/certificate/.errors
@@ -1,2 +1,3 @@
 ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file.
 ZWEL0164E|164|Value of %s (%s) defined in Zowe YAML configuration file is invalid. Valid values are %s.
+ZWEL0300W||%s already exists. This %s will be overwritten.
\ No newline at end of file
diff --git a/bin/commands/init/certificate/index.sh b/bin/commands/init/certificate/index.sh
index 90106839fb..e4951bdea9 100644
--- a/bin/commands/init/certificate/index.sh
+++ b/bin/commands/init/certificate/index.sh
@@ -344,7 +344,7 @@ elif [[ "${cert_type}" == JCE*KS ]]; then
   # should we clean up before creating new
   if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
     # warning
-    print_message "Warning ZWEL0300W: Keyring \"safkeyring://${keyring_owner}/${keyring_name}\" will be overwritten during configuration."
+    print_message "Warning ZWEL0300W: Keyring \"safkeyring://${keyring_owner}/${keyring_name}\" already exists. This keyring will be overwritten."
 
     zwecli_inline_execute_command \
       certificate keyring-jcl clean \
diff --git a/bin/commands/init/stc/index.sh b/bin/commands/init/stc/index.sh
index ec74a30585..f3dbcda2ac 100644
--- a/bin/commands/init/stc/index.sh
+++ b/bin/commands/init/stc/index.sh
@@ -92,7 +92,7 @@ for mb in ${target_proclibs}; do
   if [ "${stc_existence}" = "true" ]; then
     if [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" = "true" ]; then
       # warning
-      print_message "Warning ZWEL0300W: ${proclib}(${mb}) already exists. This data set member will be overwritten during configuration."
+      print_message "Warning ZWEL0300W: ${proclib}(${mb}) already exists. This member will be overwritten."
     else
       # print_error_and_exit "Error ZWEL0158E: ${proclib}(${mb}) already exists." "" 158
       # warning

From d1f449d043be639111f476d79dbcf93cf7080a65 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Wed, 19 Feb 2025 14:01:41 -0500
Subject: [PATCH 15/15] Fix last 300w?

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 bin/commands/certificate/pkcs12/trust-service/.errors | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/commands/certificate/pkcs12/trust-service/.errors b/bin/commands/certificate/pkcs12/trust-service/.errors
index b83fd47077..aaaf2517ab 100644
--- a/bin/commands/certificate/pkcs12/trust-service/.errors
+++ b/bin/commands/certificate/pkcs12/trust-service/.errors
@@ -1,2 +1,2 @@
-ZWEL0300W||%s already exists. This %s will be overwritten during configuration.
+ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0170E|170|Failed to trust service "%s".