Skip to content

Commit

Permalink
Merge ab01f8c into d2e0137
Browse files Browse the repository at this point in the history
  • Loading branch information
Heerschop committed Aug 15, 2019
2 parents d2e0137 + ab01f8c commit 55e0ad4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions lib/helpers/combine-config.js
Expand Up @@ -13,7 +13,7 @@ module.exports = function combineConfig(config, argv) {
//Extract options from config
let {
from, to, files, ignore, encoding, verbose,
allowEmptyPaths, disableGlobs, isRegex, dry,
allowEmptyPaths, disableGlobs, isRegex, dry, quiet,
} = config;

//Get from/to parameters from CLI args if not defined in options
Expand Down Expand Up @@ -48,10 +48,13 @@ module.exports = function combineConfig(config, argv) {
if (typeof dry === 'undefined') {
dry = !!argv.dry;
}
if (typeof quiet === 'undefined') {
quiet = !!argv.quiet;
}

//Return through parser to validate
return parseConfig({
from, to, files, ignore, encoding, verbose,
allowEmptyPaths, disableGlobs, isRegex, dry,
allowEmptyPaths, disableGlobs, isRegex, dry, quiet,
});
};

0 comments on commit 55e0ad4

Please sign in to comment.