deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-17 21:56:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1416 from thelounge/xpaw/handle-distro-configs

Browse source 
Use .lounge_config to help distribution packages handle config paths right
This commit is contained in:
Jérémie Astori 2017-08-15 20:11:38 -04:00 committed by GitHub
parent 6ce46a63bf 5299d976c0
commit f93634df39
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.lounge_config Normal file
View file

@ -0,0 +1 @@
~/.lounge

20
src/command-line/index.js
View file

@ -13,7 +13,25 @@ program.version(Helper.getVersion(), "-v, --version")
.option("--home <path>", "path to configuration folder")
.parseOptions(process.argv);
Helper.setHome(program.home || process.env.LOUNGE_HOME);
if (program.home) {
log.warn(`${colors.green("--home")} is deprecated and will be removed in a future version.`);
log.warn(`Use ${colors.green("LOUNGE_HOME")} environment variable instead.`);
}
let home = program.home || process.env.LOUNGE_HOME;
if (!home) {
const distConfig = path.resolve(path.join(
__dirname,
"..",
"..",
".lounge_config"
));
home = fs.readFileSync(distConfig, "utf-8").trim();
}
Helper.setHome(home);
if (!fs.existsSync(Helper.CONFIG_PATH)) {
fsextra.ensureDirSync(Helper.HOME);

2
src/helper.js
View file

@ -60,7 +60,7 @@ function getGitCommit() {
}
function setHome(homePath) {
this.HOME = expandHome(homePath || "~/.lounge");
this.HOME = expandHome(homePath);
this.CONFIG_PATH = path.join(this.HOME, "config.js");
this.USERS_PATH = path.join(this.HOME, "users");