Merge pull request #3630 from zowe/users/oscar/merge2.12rctoMaster

Zowe merge 2.12 RC to Master

.dependency/zwe_doc_generation/md-content.js

@@ -46,7 +46,7 @@ function generateDocumentationForNode(curNode, assembledParentNode) {
             docContent += createDocContent(assembledDocNode[docType.fileName].content, docType);
             const parentDocContent = createDocContent(assembledDocNode[docType.fileName].parentContent, docType);
             if (parentDocContent) {
-                docContent += SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent;
+                docContent += SEPARATOR + SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent;
             }
         }
 

bin/commands/components/search/.parameters

@@ -1,5 +1,5 @@
 component-name,component|o|string|||||Component name to search for.
 component-id,id|d|string|||||Component id to search for.
-registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used.
+registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used.
 handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used.
 

bin/commands/components/uninstall/.parameters

@@ -1,4 +1,4 @@
 component-name,component|o|string|required||||The name of an installed component.
-registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used.
+registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used.
 handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used.
 dry-run|d|boolean|||||Whether or not to perform the upgrade versus just checking if an upgrade is available

bin/commands/components/upgrade/.parameters

@@ -1,4 +1,4 @@
 component-file,component|o|string|required||||Either a path or component name. The path must be to a component package or directory. If a name is specified instead, install checks the zowe package registry.
-registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used.
+registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used.
 handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used.
 dry-run|d|boolean|||||Whether or not to perform the upgrade versus just checking if an upgrade is available

bin/libs/shell.ts

@@ -73,10 +73,10 @@ export function execOutSync(command: string, ...args: string[]): ExecReturn {
     return { rc: -1 };
   }
   const rc = os.exec([command, ...args], { block: true, usePath: true, stdout: pipeArray[1]});
+  os.close(pipeArray[1]);
 
   let out = readStreamFully(pipeArray[0]);
   os.close(pipeArray[0]);
-  os.close(pipeArray[1]);
 
   return {
     rc, out
@@ -94,11 +94,11 @@ export function execErrSync(command: string, ...args: string[]): ExecReturn {
   if (!pipeArray){
     return { rc: -1 };
   }
-  const rc = os.exec([command, ...args], { block: true, usePath: true, stderr: pipeArray[1]});
-
+  const rc = os.exec([command, ...args], { block: true, usePath: true, stderr: pipeArray[1]}); 
+  os.close(pipeArray[1]);  
+
   let err = readStreamFully(pipeArray[0]);
   os.close(pipeArray[0]);
-  os.close(pipeArray[1]);
 
   return {
     rc, err
@@ -117,16 +117,17 @@ export function execOutErrSync(command: string, ...args: string[]): ExecReturn {
     return { rc: -1 };
   }
   const rc = os.exec([command, ...args], { block: true, usePath: true, stdout: pipeArray[1], stderr: errArray[1]});
+  os.close(pipeArray[1]);
+  os.close(errArray[1]);
 
   let out = readStreamFully(pipeArray[0]);
   os.close(pipeArray[0]);
-  os.close(pipeArray[1]);
-
+
   let err = readStreamFully(errArray[0]);
   os.close(errArray[0]);
-  os.close(errArray[1]);
+
   return {
-    rc, err
+    rc, out, err 
   };
 }
 

bin/libs/zos.ts

@@ -25,6 +25,7 @@ export function tsoCommand(...args:string[]): { rc: number, out: string } {
     common.printTrace(`  * Exit code: ${result.rc}`);
     common.printTrace("  * Output:");
     if (result.out) {
+      result.out = result.out.substring(0, result.out.length - 1);
       common.printTrace(stringlib.paddingLeft(result.out, "    "));
     }
   } else {
@@ -35,8 +36,7 @@ export function tsoCommand(...args:string[]): { rc: number, out: string } {
       common.printError(stringlib.paddingLeft(result.out, "    "));
     }
   }
-  //we strip the '.' we added above
-  return { rc: result.rc, out: result.out ? result.out.substring(0, result.out.length-1) : '' };
+  return { rc: result.rc, out: result.out ? result.out : '' };
 }
 
 export function operatorCommand(command: string): { rc: number, out: string } {