Fix for compare sequence numbers and online help

packages/cli/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Correct extra character being displayed at the end of lines when issuing `zowe files compare` on Windows. [#1992](https://github.com/zowe/zowe-cli/issues/1992)
+- BugFix: Correct the online help description for `zowe files compare uss`. [#1754](https://github.com/zowe/zowe-cli/issues/1754)
+
 ## `7.20.1`
 
 - BugFix: Add missing npm-shrinkwrap

packages/cli/src/zosfiles/-strings-/en.ts

@@ -819,8 +819,8 @@ export default {
                 }
             },
             USS_FILE: {
-                SUMMARY: "Compare content of a local file and a z/os uss files",
-                DESCRIPTION: "Compare the contents of a two uss files on your terminal (stdout). browser.",
+                SUMMARY: "Compare the contents of two z/os uss files",
+                DESCRIPTION: "Compare the contents of two uss files on your terminal (stdout). browser.",
                 POSITIONALS: {
                     USSFILEPATH1: "The path of the first uss file you want to compare.",
                     USSFILEPATH2: "The path of the second uss file you want to compare."

packages/cli/src/zosfiles/compare/CompareBaseHelper.ts

@@ -164,7 +164,11 @@
     public prepareContent(content: string | Buffer): string {
         let contentString = content.toString();
         if(this.seqnum === false) {
-            const seqnumlen = 8;
+            let seqnumlen = 8;
+            /* If Windows, account for the carriage return */
+            if(process.platform === "win32" && content.toString().endsWith("\r\n")){
+                seqnumlen = 9;
+            }
             contentString = content.toString().split("\n").map((line) => line.slice(0, -seqnumlen)).join("\n");
         }
         return contentString;