wpstudio/hiring-test-one
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes 75lb/config-master#1

Browse Source
This commit is contained in:
Lloyd Brookes
2014-06-14 07:03:41 +01:00
parent b8e54e9e29
commit 2b90709820
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/ws.js
View File

@ -43,7 +43,7 @@ var storedConfig = loadConfig(
/* override stored config with values parsed from command line */ /* override stored config with values parsed from command line */
try { try {
var argv = cliArgs([ var argv = cliArgs([
{ name: "port", alias: "p", type: Number, defaultOption: true, value: 8000 }, { name: "port", alias: "p", type: Number, defaultOption: true },
{ name: "log-format", alias: "f", type: String }, { name: "log-format", alias: "f", type: String },
{ name: "help", alias: "h", type: Boolean }, { name: "help", alias: "h", type: Boolean },
{ name: "directory", alias: "d", type: String, value: process.cwd() }, { name: "directory", alias: "d", type: String, value: process.cwd() },
@ -53,7 +53,7 @@ try {
} catch(err){ } catch(err){
halt(err.message); halt(err.message);
} }
argv = o.extend(storedConfig, argv); argv = o.extend({ port: 8000 }, storedConfig, argv);
if (argv.config){ if (argv.config){
dope.log("Stored config: "); dope.log("Stored config: ");