Update help

Author: cockerma

addtocicsbundle/README.md

@@ -7,17 +7,19 @@ Script to add pre-build Java archive files to a CICS bundle, including:
 * .eba files for enterprise business archives
 * .ear files for enterprise archives
 
-If the CICS bundle does not exist, it will be created. If the CICS bundle contains only pre-built Java archive files, it does not need to be built by the CICS build toolkit.
+If the CICS bundle does not exist, it will be created.
+
+If the CICS bundle contains only pre-built Java archive files, it does not need to be built by the CICS build toolkit.
 
 ## Requirements
 
 * [bash](https://www.gnu.org/software/bash/bash.html?cm_mc_uid=33935548072714933125385&cm_mc_sid_50200000=1493879051&cm_mc_sid_52640000=1493879738#downloading) is used to run the script. For Linux this is likely pre-installed.
-* [xmlstarlet](http://xmlstar.sourceforge.net/overview.php) used to update the CICS bundle manifest file cics.xml.
+* [xmlstarlet](http://xmlstar.sourceforge.net/overview.php) used to update the CICS bundle manifest file cics.xml. For Linux this is likely available for installation from your distribution package manager.
 
 ## Usage
 
 ~~~~
-Usage:	addtocicsbundle [-hv] [-j JVMSERVER] -a FILES DIRECTORY
+Usage:	addtocicsbundle [-hv] [-j JVMSERVER] [-V VERSION] -a FILES DIRECTORY
 
 Add Java pre-built archive files to the CICS bundle specified by DIRECTORY.
 
@@ -26,21 +28,22 @@ Options:
 -a FILES, --add            Files or directory of files to add to the CICS bundle
 -h, --help                 Help
 -j JVMSERVER, --jvmserver  CICS JVMSERVER resource name
-                           The default is DFHWLP for files with .war .ear .eba extensions, and DFHOSGI .jar extensions
--V, --version              Set the bundle version in major.minor.micro format
+                           The default is DFHWLP for files with .war .ear .eba extensions, and DFHOSGI with .jar extensions
+-V VERSION, --version      Set the bundle version in major.minor.micro format
 -v, --verbose              Verbose messages
 
 DIRECTORY is the CICS bundle directory
 ~~~~
 
 ## Example
 
-This example will create a CICS bundle in directory output/bundles/com.ibm.cics.server.examples.bundle and add *.jar and *.war archive files.
+This example will create a CICS bundle in directory output/bundles/com.ibm.cics.server.examples.bundle and add all the Java archives in archive files in path javaarchives/*.
 
-Note the `-a "javaarchives/*"` parameter includes quotation marks to avoid the shell interpreter expansion.
+Note the `-a "javaarchives/*"` parameter includes quotation marks to avoid the shell interpreter expanding the * character.
 
 ~~~~console
-$ addtocicsbundle -v -a "javaarchives/*" output/bundles/com.ibm.cics.server.examples.bundle
+$ scripts/addtocicsbundle -v -a "javaarchives/*" output/bundles/com.ibm.cics.server.examples.bundle
+
 Creating CICS bundle manifest file output/bundles/com.ibm.cics.server.examples.bundle/META-INF/cics.xml
 Creating CICS bundle part file output/bundles/com.ibm.cics.server.examples.bundle/com.ibm.cics.server.examples.hello.osgibundle
 Adding bundle part to the CICS bundle manifest file output/bundles/com.ibm.cics.server.examples.bundle/META-INF/cics.xml
@@ -76,6 +79,6 @@ total 4
 Exiting with RC=0
 ~~~~
 
-The bundles/MyBundle directory can now be copied to the CICS [platform directory structure in z/OS UNIX](https://www.ibm.com/support/knowledgecenter/SSGMCP_5.3.0/com.ibm.cics.ts.productoverview.doc/concepts/platforms_directory_structure.html), such as /var/cicsts/CICSPlex/_platform1_/ or another location ready for installing in CICS.
+The output directory can now be copied to the CICS [platform directory structure in z/OS UNIX](https://www.ibm.com/support/knowledgecenter/SSGMCP_5.3.0/com.ibm.cics.ts.productoverview.doc/concepts/platforms_directory_structure.html) such as /var/cicsts/CICSPlex/_platform1_/. A BUNDLE resource can then be defined and installed to install in CICS.
 
 Alternatively, the bundles/MyBundle directory can be copied (staged) to IBM UrbanCode Deploy using the [pushcicsbundletoucd](../pushcicsbundletoucd) script and deployed using the [ucdtemplates](../ucdtemplates).

addtocicsbundle/addtocicsbundle

@@ -21,7 +21,7 @@ show_help () {
 	echo -e "\t-a FILES, --add\t\t\tFiles or directory of files to add to the CICS bundle"
 	echo -e "\t-h, --help\t\t\tHelp"
 	echo -e "\t-j JVMSERVER, --jvmserver\tCICS JVMSERVER resource name"
-	echo -e "\t\t\t\t\tThe default is DFHWLP for files with .war .ear .eba extensions, and DFHOSGI .jar extensions"
+	echo -e "\t\t\t\t\tThe default is DFHWLP for files with .war .ear .eba extensions, and DFHOSGI with .jar extensions"
 	echo -e "\t-V VERSION, --version\t\tSet the bundle version in major.minor.micro format"
 	echo -e "\t-v, --verbose\t\t\tVerbose messages"
 	echo -e "\tDIRECTORY is the CICS bundle directory"
@@ -212,7 +212,7 @@ set_cics_bundle_version() {
 	fi
 
 	if [[ $VERBOSE == 1 ]] ; then
-		echo "Setting CICS bundle version to ${BUNDLEVERSION}"
+		echo "Updating CICS bundle manifest file ${BUNDLEVERSION} to set version ${BUNDLEVERSION}"
 	fi
 
 	xmlstarlet edit -L \