mirror of
https://github.com/thelounge/thelounge
synced 2024-11-22 03:53:08 +00:00
Switch default home location to ~/.thelounge
and remove support of .lounge_home
This commit is contained in:
parent
c97352905d
commit
51684f7a2a
9 changed files with 6 additions and 22 deletions
|
@ -1 +1 @@
|
||||||
~/.lounge
|
~/.thelounge
|
||||||
|
|
|
@ -25,28 +25,12 @@ class Utils {
|
||||||
return home;
|
return home;
|
||||||
}
|
}
|
||||||
|
|
||||||
let distConfig;
|
const distConfig = path.resolve(path.join(
|
||||||
|
|
||||||
// TODO: Remove this section when releasing The Lounge v3
|
|
||||||
const deprecatedDistConfig = path.resolve(path.join(
|
|
||||||
__dirname,
|
__dirname,
|
||||||
"..",
|
"..",
|
||||||
"..",
|
"..",
|
||||||
".lounge_home"
|
".thelounge_home"
|
||||||
));
|
));
|
||||||
if (fs.existsSync(deprecatedDistConfig)) {
|
|
||||||
log.warn(`${colors.green(".lounge_home")} is ${colors.bold.red("deprecated")} and will be ignored as of The Lounge v3.`);
|
|
||||||
log.warn(`Use ${colors.green(".thelounge_home")} instead.`);
|
|
||||||
|
|
||||||
distConfig = deprecatedDistConfig;
|
|
||||||
} else {
|
|
||||||
distConfig = path.resolve(path.join(
|
|
||||||
__dirname,
|
|
||||||
"..",
|
|
||||||
"..",
|
|
||||||
".thelounge_home"
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
home = fs.readFileSync(distConfig, "utf-8").trim();
|
home = fs.readFileSync(distConfig, "utf-8").trim();
|
||||||
|
|
||||||
|
|
4
test/fixtures/.gitignore
vendored
4
test/fixtures/.gitignore
vendored
|
@ -1,5 +1,5 @@
|
||||||
# Files that may be generated by tests
|
# Files that may be generated by tests
|
||||||
.lounge/storage/
|
.thelounge/storage/
|
||||||
|
|
||||||
# Fixtures contain fake packages, stored in a fake node_modules folder
|
# Fixtures contain fake packages, stored in a fake node_modules folder
|
||||||
!.lounge/packages/node_modules/
|
!.thelounge/packages/node_modules/
|
||||||
|
|
2
test/fixtures/env.js
vendored
2
test/fixtures/env.js
vendored
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
global.log = require("../../src/log.js");
|
global.log = require("../../src/log.js");
|
||||||
|
|
||||||
const home = require("path").join(__dirname, ".lounge");
|
const home = require("path").join(__dirname, ".thelounge");
|
||||||
require("../../src/helper").setHome(home);
|
require("../../src/helper").setHome(home);
|
||||||
|
|
Loading…
Reference in a new issue