deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-08 08:42:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #461 from thelounge/xpaw/check-config

Browse source 
Only load config if it exists
This commit is contained in:
Jérémie Astori 2016-07-04 17:00:24 -04:00 committed by GitHub
parent 7ba11b8913 08f197f912
commit 51666b6db6
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/helper.js
View file

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