Added better default to content server root

pancakeportal99 · Aug 27, 2013 · 2ae9521 · 2ae9521
1 parent fdd9fdd
commit 2ae9521
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/bin/content.js b/bin/content.js
@@ -16,7 +16,7 @@ var argv = require('optimist')
 		},
 		'root': {
 			'description': 'Root assets path',
-			'demand': true
+			'default': path.join(__dirname, '..', 'assets')
 		},
 		'port': {
 			'description': 'Server port',
@@ -102,7 +102,7 @@ function getModFiles(mod, callback) {
 }
 
 function generateManifest(callback) {
-	console.log('generating manifest..');
+	console.log('generating manifest from ' + argv.root);
 
 	getMods(function (err, mods) {
 		if (err) return callback(err);
@@ -186,9 +186,11 @@ function handlePak(req, res, next) {
 
 function loadConfig() {
 	if (!argv.config) {
-		return;
+		return null;
 	}
 
+	var config = {};
+
 	try {
 		console.log('Loading config file from ' + argv.config + '..');
 		var data = require(argv.config);

diff --git a/bin/master.js b/bin/master.js
@@ -294,9 +294,11 @@ function connection(ws) {
 
 function loadConfig() {
 	if (!argv.config) {
-		return;
+		return null;
 	}
 
+	var config = {};
+
 	try {
 		console.log('Loading config file from ' + argv.config + '..');
 		var data = require(argv.config);

diff --git a/ioq3 b/ioq3