From e914ed50ebad47074057f25cf9d67096cdb1d349 Mon Sep 17 00:00:00 2001
From: Mattias Erming <mattias@mattiaserming.com>
Date: Tue, 14 Oct 2014 22:53:26 +0200
Subject: [PATCH] Fix '--home' option

---
 src/client.js             |  2 +-
 src/command-line/add.js   |  2 +-
 src/command-line/index.js | 20 ++++++++++++--------
 src/command-line/start.js |  2 --
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/client.js b/src/client.js
index 3ef2108b..3a9cbdf3 100644
--- a/src/client.js
+++ b/src/client.js
@@ -339,7 +339,7 @@ Client.prototype.save = function(force) {
 	}
 	
 	var name = this.name;
-	var path = Helper.HOME + "/users/" + name + "/user.json";
+	var path = Helper.HOME + "/users/" + name + ".json";
 	
 	var networks = _.map(
 		this.networks,
diff --git a/src/command-line/add.js b/src/command-line/add.js
index bf7761d6..00291461 100644
--- a/src/command-line/add.js
+++ b/src/command-line/add.js
@@ -54,7 +54,7 @@ function add(manager, name, password) {
 	console.log("");
 	var salt = bcrypt.genSaltSync(8);
 	var hash = bcrypt.hashSync(password, salt);
-	var x = manager.addUser(
+	manager.addUser(
 		name,
 		hash
 	);
diff --git a/src/command-line/index.js b/src/command-line/index.js
index a5159ef9..40ebcdb6 100644
--- a/src/command-line/index.js
+++ b/src/command-line/index.js
@@ -5,6 +5,8 @@ var mkdirp = require("mkdirp");
 var Helper = require("../helper");
 
 program.version(pkg.version, "-v, --version");
+program.option("");
+program.option("    --home <path>" , "home path");
 
 require("./start");
 require("./config");
@@ -14,18 +16,20 @@ require("./remove");
 require("./reset");
 require("./edit");
 
-program.parse(process.argv);
-
+var argv = program.parseOptions(process.argv);
 if (program.home) {
 	Helper.HOME = program.home;
-} else {
-	var config = Helper.HOME + "/config.js";
-	if (!fs.existsSync(config)) {
-		mkdirp.sync(Helper.HOME);
-		fs.writeFileSync(config, fs.readFileSync(__dirname + "/../../defaults/config.js"));
-	}
 }
 
+var config = Helper.HOME + "/config.js";
+if (!fs.existsSync(config)) {
+	mkdirp.sync(Helper.HOME);
+	fs.writeFileSync(config, fs.readFileSync(__dirname + "/../../defaults/config.js"));
+	console.log("Config created:" + config);
+}
+
+program.parse(argv.args);
+
 if (!program.args.length) {
 	program.parse(process.argv.concat("start"));
 }
diff --git a/src/command-line/start.js b/src/command-line/start.js
index 8a73ca17..7637712d 100644
--- a/src/command-line/start.js
+++ b/src/command-line/start.js
@@ -5,8 +5,6 @@ var shout = require("../server");
 var Helper = require("../helper");
 
 program
-	.option("")
-	.option("    --home <path>" , "home path")
 	.option("-H, --host <ip>"   , "host")
 	.option("-P, --port <port>" , "port")
 	.option("-B, --bind <ip>"   , "bind")