supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Move config.js into the Shout home directory by default

Browse Source
This commit is contained in:
Shell Turner 2014-10-01 18:13:37 +02:00
parent 7e4534afa9
commit 791a5914df
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.js
View File

@ -187,7 +187,3 @@ module.exports = {
certificate: "" certificate: ""
} }
}; };
if ("SHOUT_CONFIG" in process.env) {
module.exports = require(process.env.SHOUT_CONFIG);
}

12
src/helper.js
View File

@ -1,13 +1,21 @@
var fs = require("fs");
var path = require("path"); var path = require("path");
var Helper = module.exports = { var Helper = module.exports = {
getConfig: function () { getConfig: function () {
return require(path.resolve(__dirname, "..", "config")); var filename = process.env.SHOUT_CONFIG;
if(!filename || !fs.exists(filename)) {
filename = this.resolveHomePath("config.js");
if(!fs.exists(filename)) {
filename = path.resolve(__dirname, "..", "config");
}
}
return require(filename);
}, },
getHomeDirectory: function () { getHomeDirectory: function () {
return ( return (
this.getConfig().home (process.env.SHOUT_CONFIG && fs.exists(process.env.SHOUT_CONFIG) && this.getConfig().home)
|| process.env.SHOUT_HOME || process.env.SHOUT_HOME
|| path.resolve(process.env.HOME, ".shout") || path.resolve(process.env.HOME, ".shout")
); );