Merge branch 'patch-1' of https://github.com/michaelmerrill/wait-on i…

…nto allow-config-resources
jeffbski · Dec 26, 2020 · db0d080 · db0d080
2 parents 546f1bf + 4d94e74
commit db0d080
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/bin/wait-on b/bin/wait-on
@@ -24,7 +24,7 @@ const minimistOpts = {
 
 const argv = minimist(process.argv.slice(2), minimistOpts);
 
-if (argv.help || !argv._.length) {
+if (argv.help) {
   // help
   fs.createReadStream(path.join(__dirname, '/usage.txt'))
     .pipe(process.stdout)
@@ -40,8 +40,10 @@ if (argv.help || !argv._.length) {
     opts = require(path.resolve(configFile));
   }
 
-  // add in the resources listed on the command line
-  opts.resources = argv._;
+  // add in the resources listed on the command line (if not present in config)
+  if (!opts.resources) { 
+    opts.resources = argv._;
+  }
 
   // now check for specific options and set those
   opts = [