deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-29 10:40:35 +02:00
Code Issues Projects Releases Wiki Activity

Only load config if it exists

Browse source
This commit is contained in:
Pavel Djundik 2016-07-04 23:15:30 +03:00
parent 7ba11b8913
commit 08f197f912
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/helper.js
View file

@ -1,6 +1,7 @@
var _ = require("lodash"); var _ = require("lodash");
var path = require("path"); var path = require("path");
var os = require("os"); var os = require("os");
var fs = require("fs");
var Helper = { var Helper = {
config: null, config: null,
@ -25,9 +26,11 @@ function setHome(homePath) {
this.USERS_PATH = path.join(this.HOME, "users"); this.USERS_PATH = path.join(this.HOME, "users");
// Reload config from new home location // Reload config from new home location
if (fs.existsSync(this.CONFIG_PATH)) {
var userConfig = require(this.CONFIG_PATH); var userConfig = require(this.CONFIG_PATH);
this.config = _.extend(this.config, userConfig); this.config = _.extend(this.config, userConfig);
} }
}
function getUserConfigPath(name) { function getUserConfigPath(name) {
return path.join(this.USERS_PATH, name + ".json"); return path.join(this.USERS_PATH, name + ".json");