1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00

Merge branch 'develop' into release-v1.0.0

This commit is contained in:
J. Ryan Stinnett
2019-02-14 16:46:34 +00:00

View File

@@ -155,8 +155,8 @@ echo "npm version"
# manually commit the result.
npm version --no-git-tag-version "$release"
# commit package-lock.json if it exists and is versioned
if [[ -f package-lock.json && -z `git status --porcelain --ignored package-lock.json` ]];
# commit package-lock.json if it exists, is versioned, and is modified
if [[ -f package-lock.json && `git status --porcelain package-lock.json | grep '^ M'` ]];
then
pkglock='package-lock.json'
else