Merge branch 'develop' into release/1.1.0

particl · Feb 3, 2018 · e9543da · e9543da
2 parents 16309e3 + 675ca95
commit e9543da
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -24,16 +24,17 @@
     "e2e": "ng e2e",
     "generate:versions": "node modules/clientBinaries/generateVersions.js",
     "generate:documentation": "",
+    "checksum": "cd packages && checksum -a sha256 *.*",
     "build:electron:prod": "ng build --base-href=./ --env=prod",
     "build:electron:fast": "ng build --base-href=./ --sourcemap=false",
     "build:electron": "ng build --base-href=./",
     "start:electron:dev": "electron . --dev",
-    "start:electron:fast": "npm run build:electron:fast && electron .",
-    "start:electron": "npm run build:electron && electron .",
-    "package:mac": "npm run build:electron:prod && electron-builder -m && sha256sum packages/*.*",
-    "package:linux": "npm run build:electron:prod && electron-builder -l && sha256sum packages/*.*",
-    "package:win": "npm run build:electron:prod && electron-builder --win --x64 && sha256sum packages/*.*",
-    "package": "npm run build:electron:prod && electron-builder -ml && npm run package:win && sha256sum packages/*.*",
+    "start:electron:fast": "yarn run build:electron:fast && electron .",
+    "start:electron": "yarn run build:electron && electron .",
+    "package:mac": "yarn run build:electron:prod && electron-builder -m && yarn run checksum",
+    "package:linux": "yarn run build:electron:prod && electron-builder -l && yarn run checksum",
+    "package:win": "yarn run build:electron:prod && electron-builder --win --x64 && yarn run checksum",
+    "package": "yarn run build:electron:prod && electron-builder -ml && yarn run package:win && yarn run checksum",
     "coveralls": "cat ./coverage/lcov.info | node ./node_modules/coveralls/bin/coveralls.js",
     "compodoc": "compodoc -p tsconfig.json -d docs",
     "generate-release": "node ./modules/clientBinaries/generateVersions.js"
@@ -175,6 +176,7 @@
     "@compodoc/compodoc": "^1.0.4",
     "@types/jasmine": "^2.8.5",
     "@types/node": "^9.3.0",
+    "checksum": "^0.1.1",
     "codelyzer": "^4.1.0",
     "coveralls": "^3.0.0",
     "electron": "1.7.12",

diff --git a/yarn.lock b/yarn.lock
@@ -1417,6 +1417,12 @@ chalk@~2.2.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+checksum@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/checksum/-/checksum-0.1.1.tgz#dc6527d4c90be8560dbd1ed4cecf3297d528e9e9"
+  dependencies:
+    optimist "~0.3.5"
+
 cheerio@^1.0.0-rc.2:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
@@ -6215,6 +6221,12 @@ optimist@^0.6.1, optimist@~0.6.0:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
+optimist@~0.3.5:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
+  dependencies:
+    wordwrap "~0.0.2"
+
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"