Skip to content

Commit

Permalink
Temp fix for #21
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinohara80 committed Jan 27, 2017
1 parent 51d9901 commit 9557464
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions commands/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var run = module.exports.run = function(opts) {
meta: opts.meta
}, function(err, res) {
if(err) {
console.error(err);
logger.error('deploy failed: re-watching files');
} else {
logger.success('deploy complete: re-watching files');
Expand Down
16 changes: 8 additions & 8 deletions lib/get-files.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ var glob = require('glob');
var async = require('async');
var _ = require('lodash');

// var globOpts = {
// matchBase: true,
// nodir: false,
// noglobstar: false,
// nomount: true
// };

module.exports = function(opts, cb) {

opts = _.defaults(opts || {}, {
Expand All @@ -31,7 +24,14 @@ module.exports = function(opts, cb) {
}, cb);
};

async.concat(opts.globs, iterator, function(err, files) {
// fixes #21 by removing meta-xml files. Probably not the long
// term solution
const globs = _(opts.globs)
.map(g => g.replace(/\-meta\.xml$/i, ''))
.uniq()
.value();

async.concat(globs, iterator, function(err, files) {
if(err) return cb(err);

if(!files || files.length < 1) {
Expand Down

0 comments on commit 9557464

Please sign in to comment.