Normalise path to configuration file when specified on the command line

diff --git a/server/configuration.js b/server/configuration.js
index b8241f33f46731c73195766c76aa10f60f5b4df6..f9ed927180fbc36652f6521c3c3d2b3db67251db 100644 (file)
--- a/server/configuration.js
+++ b/server/configuration.js
@@ -1,6 +1,7 @@
 var fs      = require('fs'),
     events  = require('events'),
-    util    = require('util');
+    util    = require('util'),
+    path    = require('path');
 
 var config_filename = 'config.js',
     config_dirs = ['/etc/kiwiirc/', __dirname + '/../'],
@@ -17,7 +18,8 @@ Config.prototype.loadConfig = function (manual_config_file) {
         conf_filepath,
         i;
 
-    if (manual_config_file) {
+    if ((manual_config_file) || (this.manual_config_file)) {
+        manual_config_file =  path.resolve(path.normalize(manual_config_file || this.manual_config_file));
         if (fs.existsSync(manual_config_file)) {
             try {
                 if (fs.lstatSync(manual_config_file).isFile() === true) {