verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Joan Sanchez 2020-09-14 13:37:20 +02:00
parent 1348cc9df8 26f0958838
commit 652812bca4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
print/core/config.js
View File

@ -13,14 +13,15 @@ let configFiles = [
];
for (let configFile of configFiles) {
const filePath = path.join(__dirname, configFile);
if (fs.existsSync(filePath)) {
const conf = require(filePath);
if (!configFile.includes(configPath))
configFile = path.join(__dirname, configFile);
if (fs.existsSync(configFile)) {
const conf = require(configFile);
for (let prop in conf)
Object.assign(config[prop], conf[prop]);
}
}
config.env = env;
module.exports = config;