scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2024-12-29 09:22:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid clash with --branch argv in Node 10

Browse source
This commit is contained in:
Jürg Lehni 2019-04-11 20:01:31 +02:00
parent a769831809
commit 330b7d0eb9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gulp/utils/options.js
View file

@ -24,9 +24,10 @@ options.date = git('log -1 --pretty=format:%ad');
options.branch = git('rev-parse --abbrev-ref HEAD'); options.branch = git('rev-parse --abbrev-ref HEAD');
// If a specific branch is requested, quit without errors if we don't match. // If a specific branch is requested, quit without errors if we don't match.
if (argv.branch && argv.branch !== options.branch) { var ensureBranch = argv['ensure-branch'];
console.log('Branch "' + options.branch + '" does not match "' + if (ensureBranch && ensureBranch !== options.branch) {
argv.branch + '". There is nothing to do here.'); console.log('Branch "' + options.branch + '" does not match requested "' +
ensureBranch + '". There is nothing to do here.');
process.exit(0); process.exit(0);
} }

4
package.json
View file

@ -13,8 +13,8 @@
"main": "dist/paper-full.js", "main": "dist/paper-full.js",
"types": "dist/paper.d.ts", "types": "dist/paper.d.ts",
"scripts": { "scripts": {
"precommit": "gulp jshint --branch develop", "precommit": "gulp jshint --ensure-branch develop",
"prepush": "gulp test --branch develop", "prepush": "gulp test --ensure-branch develop",
"build": "gulp build", "build": "gulp build",
"dist": "gulp dist", "dist": "gulp dist",
"zip": "gulp zip", "zip": "gulp zip",