Avoid clash with --branch argv in Node 10

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

View file

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

View file

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