Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-24 04:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #284 from maxpoulin64/tilde

Browse source 
Add support for ~ home folder expansion
This commit is contained in:
Pavel Djundik 2016-04-27 11:30:06 +03:00
commit 8380fc3b68
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/helper.js
View file

@ -1,10 +1,29 @@
var path = require("path"); var path = require("path");
var os = require("os");
module.exports = { module.exports = {
HOME: (process.env.HOME || process.env.USERPROFILE) + "/.lounge", HOME: (process.env.HOME || process.env.USERPROFILE) + "/.lounge",
getConfig: getConfig getConfig: getConfig,
expandHome: expandHome,
}; };
function getConfig() { function getConfig() {
return require(path.resolve(this.HOME) + "/config"); return require(path.resolve(this.HOME) + "/config");
} }
function expandHome(path) {
var home;
if (os.homedir) {
home = os.homedir();
}
if (!home) {
home = process.env.HOME || "";
}
home = home.replace("$", "$$$$");
return path.replace(/^~($|\/|\\)/, home + "$1");
}

4
src/server.js
View file

@ -33,8 +33,8 @@ module.exports = function(options) {
} else { } else {
server = require("spdy"); server = require("spdy");
server = server.createServer({ server = server.createServer({
key: fs.readFileSync(https.key), key: fs.readFileSync(Helper.expandHome(https.key)),
cert: fs.readFileSync(https.certificate) cert: fs.readFileSync(Helper.expandHome(https.certificate))
}, app).listen(port, host); }, app).listen(port, host);
} }