zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-10 14:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Supply config path to main.js and oputil.js, rather than specific config file

Browse source
This commit is contained in:
David Stephens 2017-11-25 22:45:19 +00:00
parent 32557975d9
commit 521e38d7e9
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/bbs.js
View file

@ -29,11 +29,12 @@ const ENIGMA_COPYRIGHT = 'ENiGMA½ Copyright (c) 2014-2017 Bryan Ashby';
const HELP =
`${ENIGMA_COPYRIGHT}
usage: main.js <args>
eg : main.js --config /enigma_install_path/config/
valid args:
--version : display version
--help : displays this help
--config PATH : override default config.hjson path
--config PATH : override default config path
`;
function printHelpAndExit() {
@ -56,7 +57,8 @@ function main() {
return callback(null, configOverridePath || conf.getDefaultPath(), _.isString(configOverridePath));
},
function initConfig(configPath, configPathSupplied, callback) {
conf.init(resolvePath(configPath), function configInit(err) {
const configFile = configPath + 'config.hjson';
conf.init(resolvePath(configFile), function configInit(err) {
//
// If the user supplied a path and we can't read/parse it
@ -65,7 +67,7 @@ function main() {
if(err) {
if('ENOENT' === err.code) {
if(configPathSupplied) {
console.error('Configuration file does not exist: ' + configPath);
console.error('Configuration file does not exist: ' + configFile);
} else {
configPathSupplied = null; // make non-fatal; we'll go with defaults
}