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

Remove deprecated support for the --home option and $LOUNGE_HOME environment variable

Browse Source
This commit is contained in:
Jérémie Astori 2017-11-22 16:51:22 -05:00
parent d0f5d5025e
commit 826482bb5b
No known key found for this signature in database
GPG Key ID: B9A4F245CD67BDE8
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/command-line/index.js
View File

@ -16,7 +16,6 @@ if (require("semver").lt(process.version, "6.0.0")) {
} }
program.version(Helper.getVersion(), "-v, --version") program.version(Helper.getVersion(), "-v, --version")
.option("--home <path>", `${colors.bold.red("[DEPRECATED]")} Use the ${colors.green("THELOUNGE_HOME")} environment variable instead.`)
.option( .option(
"-c, --config <key=value>", "-c, --config <key=value>",
"override entries of the configuration file, must be specified for each entry that needs to be overriden", "override entries of the configuration file, must be specified for each entry that needs to be overriden",
@ -27,10 +26,6 @@ program.version(Helper.getVersion(), "-v, --version")
// Parse options from `argv` returning `argv` void of these options. // Parse options from `argv` returning `argv` void of these options.
const argvWithoutOptions = program.parseOptions(process.argv); const argvWithoutOptions = program.parseOptions(process.argv);
if (program.home) {
log.warn(`${colors.bold("--home")} is ${colors.bold.red("deprecated")} and will be removed in The Lounge v3. Use the ${colors.bold("THELOUNGE_HOME")} environment variable instead.`);
}
// Check if the app was built before calling setHome as it wants to load manifest.json from the public folder // Check if the app was built before calling setHome as it wants to load manifest.json from the public folder
if (!fs.existsSync(path.join( if (!fs.existsSync(path.join(
__dirname, __dirname,
@ -43,18 +38,7 @@ if (!fs.existsSync(path.join(
process.exit(1); process.exit(1);
} }
if (process.env.LOUNGE_HOME) { Helper.setHome(process.env.THELOUNGE_HOME || Utils.defaultHome());
log.warn(`${colors.green("LOUNGE_HOME")} is ${colors.bold.red("deprecated")} and will be removed in The Lounge v3.`);
log.warn(`Use ${colors.green("THELOUNGE_HOME")} instead.`);
}
let home = process.env.THELOUNGE_HOME || program.home || process.env.LOUNGE_HOME;
if (!home) {
home = Utils.defaultHome();
}
Helper.setHome(home);
// Merge config key-values passed as CLI options into the main config // Merge config key-values passed as CLI options into the main config
_.merge(Helper.config, program.config); _.merge(Helper.config, program.config);