add git submodule to npm install

.gitignore

@@ -8,6 +8,9 @@ pids
 *.pid
 *.seed
 
+# License files
+license-*.txt
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 

README.md

@@ -13,6 +13,8 @@ You must run the following commands in order to pull the Hyperledger fabric chai
 
 You should see messages indicating that the required git repositories have been cloned into the correct vendor subdirectory.
 
+> The git submodule should not be required now, they have been added to the npm install step. When this has been confirmed as working well, this will be updated. 
+
 You must install [Lerna](https://lernajs.io) to build this multi-package repository:
 
     $ npm install -g lerna

package.json

@@ -2,6 +2,7 @@
   "devDependencies": {
     "colors": "^1.1.2",
     "lerna": "2.0.0-beta.37",
+    "licensecheck": "^1.3.0",
     "moment": "^2.17.1",
     "semver": "^5.3.0",
     "sleep-promise": "^2.0.0"
@@ -13,7 +14,7 @@
   "private": true,
   "scripts": {
     "postinstall": "npm run pkgcheck && npm run bootstrap",
-    "bootstrap": "lerna bootstrap",
+    "bootstrap": "git submodule init && git submodule update && lerna bootstrap",
     "test": "lerna run test",
     "scanlicenses": "./scripts/scan-all-licenses.sh",
     "pkgcheck": "node ./scripts/pkgcheck.js",

scripts/scan-all-licenses.sh

@@ -6,8 +6,10 @@ set -e
 # Grab the Concerto directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
+BIN=${DIR}/node_modules/.bin
+
 echo "Scanning all the node modules starting at "${DIR}
-echo "Needs to have had  npm install -g npm -g install licensecheck"
+#echo "Needs to have had  npm install -g npm -g install licensecheck"
 
 rm -f "${DIR}/license-raw.txt"
 touch "${DIR}/license-raw.txt"
@@ -19,8 +21,8 @@ touch "${DIR}/license-full.txt"
 ls -d "${DIR}"/packages/* | while read dirname
 do
   cd "${dirname}" 
-  licensecheck --tsv >>  "${DIR}/license-raw.txt"
-  licensecheck >> "${DIR}/license-full.txt"
+  ${BIN}/licensecheck --tsv >>  "${DIR}/license-raw.txt"
+  ${BIN}/licensecheck >> "${DIR}/license-full.txt"
   echo "-------------------------------------------" >> "${DIR}/license-full.txt"
 
 done