zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-07-28 13:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix oputil

Browse source
This commit is contained in:
Bryan Ashby 2020-07-06 19:13:22 -06:00
parent 9d8b43b605
commit c91ae50c6b
No known key found for this signature in database
GPG key ID: B49EB437951D2542
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/config.js
View file

@ -12,7 +12,12 @@ exports.Config = class Config extends ConfigLoader {
super(options);
}
static create(baseConfigPath, cb) {
static create(baseConfigPath, options, cb) {
if (!cb && _.isFunction(options)) {
cb = options;
options = {};
}
const replacePaths = [
'loginServers.ssh.algorithms.kex',
'loginServers.ssh.algorithms.cipher',
@ -24,7 +29,7 @@ exports.Config = class Config extends ConfigLoader {
'args', 'sendArgs', 'recvArgs', 'recvArgsNonBatch',
];
const options = {
const configOptions = Object.assign({}, options, {
defaultConfig : DefaultConfig,
defaultsCustomizer : (defaultVal, configVal, key, path) => {
if (Array.isArray(defaultVal) && Array.isArray(configVal)) {
@ -43,9 +48,9 @@ exports.Config = class Config extends ConfigLoader {
Events.emit(Events.getSystemEvents().ConfigChanged);
}
},
};
});
systemConfigInstance = new Config(options);
systemConfigInstance = new Config(configOptions);
systemConfigInstance.init(baseConfigPath, err => {
if (err) {
console.stdout(`Configuration ${baseConfigPath} error: ${err.message}`); // eslint-disable-line no-console